diff --git a/bitnami/odoo/15/debian-11/Dockerfile b/bitnami/odoo/15/debian-11/Dockerfile index 35704071dfe7..310741571f7f 100644 --- a/bitnami/odoo/15/debian-11/Dockerfile +++ b/bitnami/odoo/15/debian-11/Dockerfile @@ -3,10 +3,10 @@ FROM docker.io/bitnami/minideb:bullseye ARG TARGETARCH LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-04-10T07:40:15Z" \ + org.opencontainers.image.created="2023-04-13T08:28:40Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="15.0.20230410-debian-11-r0" \ + org.opencontainers.image.ref.name="15.0.20230410-debian-11-r1" \ org.opencontainers.image.title="odoo" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="15.0.20230410" @@ -25,7 +25,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ "python-3.10.11-0-linux-${OS_ARCH}-debian-11" \ "render-template-1.0.5-4-linux-${OS_ARCH}-debian-11" \ "postgresql-client-15.2.0-4-linux-${OS_ARCH}-debian-11" \ - "node-18.15.0-3-linux-${OS_ARCH}-debian-11" \ + "node-18.16.0-0-linux-${OS_ARCH}-debian-11" \ "odoo-15.0.20230410-0-linux-${OS_ARCH}-debian-11" \ "gosu-1.16.0-5-linux-${OS_ARCH}-debian-11" \ ) && \ diff --git a/bitnami/odoo/15/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/odoo/15/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 74b2cd2dcbd3..7d830765d982 100644 --- a/bitnami/odoo/15/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/odoo/15/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -9,7 +9,7 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "18.15.0-3" + "version": "18.16.0-0" }, "odoo": { "arch": "amd64", diff --git a/bitnami/odoo/15/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/odoo/15/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh index 5860791219cf..94745ebe419e 100644 --- a/bitnami/odoo/15/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh +++ b/bitnami/odoo/15/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh @@ -112,10 +112,10 @@ is_web_server_running() { ######################### web_server_start() { info "Starting $(web_server_type) in background" - if [[ "$BITNAMI_SERVICE_MANAGER" = "monit" ]]; then - "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/start.sh" - elif [[ "$BITNAMI_SERVICE_MANAGER" = "systemd" ]]; then + if [[ "${BITNAMI_SERVICE_MANAGER:-}" = "systemd" ]]; then systemctl start "bitnami.$(web_server_type).service" + else + "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/start.sh" fi } @@ -130,10 +130,10 @@ web_server_start() { ######################### web_server_stop() { info "Stopping $(web_server_type)" - if [[ "$BITNAMI_SERVICE_MANAGER" = "monit" ]]; then - "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/stop.sh" - elif [[ "$BITNAMI_SERVICE_MANAGER" = "systemd" ]]; then + if [[ "${BITNAMI_SERVICE_MANAGER:-}" = "systemd" ]]; then systemctl stop "bitnami.$(web_server_type).service" + else + "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/stop.sh" fi } @@ -148,10 +148,10 @@ web_server_stop() { ######################### web_server_restart() { info "Restarting $(web_server_type)" - if [[ "$BITNAMI_SERVICE_MANAGER" = "monit" ]]; then - "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/restart.sh" - elif [[ "$BITNAMI_SERVICE_MANAGER" = "systemd" ]]; then + if [[ "${BITNAMI_SERVICE_MANAGER:-}" = "systemd" ]]; then systemctl restart "bitnami.$(web_server_type).service" + else + "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/restart.sh" fi } @@ -165,10 +165,10 @@ web_server_restart() { # None ######################### web_server_reload() { - if [[ "$BITNAMI_SERVICE_MANAGER" = "monit" ]]; then - "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/reload.sh" - elif [[ "$BITNAMI_SERVICE_MANAGER" = "systemd" ]]; then + if [[ "${BITNAMI_SERVICE_MANAGER:-}" = "systemd" ]]; then systemctl reload "bitnami.$(web_server_type).service" + else + "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/reload.sh" fi }