diff --git a/bitnami/mariadb/10.6/debian-11/Dockerfile b/bitnami/mariadb/10.6/debian-11/Dockerfile index 392976cfd54d..ad5e3b9de53b 100644 --- a/bitnami/mariadb/10.6/debian-11/Dockerfile +++ b/bitnami/mariadb/10.6/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-03-21T23:19:45Z" \ + org.opencontainers.image.created="2023-03-28T02:23:06Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="10.6.12-debian-11-r14" \ + org.opencontainers.image.ref.name="10.6.12-debian-11-r15" \ org.opencontainers.image.title="mariadb" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="10.6.12" diff --git a/bitnami/mariadb/10.6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/mariadb/10.6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index a3cabbe1589c..1b23f1c1a293 100644 --- a/bitnami/mariadb/10.6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/mariadb/10.6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -1,21 +1,18 @@ { "gosu": { "arch": "amd64", - "digest": "bf2b90a31df691e3648c4a41190a926bb638c3a9fa1dfcde36623ce1bfaadc23", "distro": "debian-11", "type": "NAMI", "version": "1.16.0-3" }, "ini-file": { "arch": "amd64", - "digest": "c75066994058575c6092fb760bd53feeb2aabd6039e942f3904de57f5a5534dc", "distro": "debian-11", "type": "NAMI", "version": "1.4.5-2" }, "mariadb": { "arch": "amd64", - "digest": "7c864f3d1d4c6021181cae546cb8840eb7403dc6145096c4569140f82a6a82bc", "distro": "debian-11", "type": "NAMI", "version": "10.6.12-2" diff --git a/bitnami/mariadb/10.6/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/mariadb/10.6/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh index 2d4b7af6fd3a..6fcb304d34cc 100644 --- a/bitnami/mariadb/10.6/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh +++ b/bitnami/mariadb/10.6/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh @@ -395,7 +395,7 @@ PartOf=bitnami.service Type=${type} EOF if [[ -n "$working_directory" ]]; then - cat >> "$service_file" <<< "WorkingDirectory=$working_directory" + cat >> "$service_file" <<< "WorkingDirectory=${working_directory}" fi if [[ -n "$exec_start_pre" ]]; then # This variable may contain multiple ExecStartPre= directives diff --git a/bitnami/mariadb/10.6/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/mariadb/10.6/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh index 818c2158032b..5860791219cf 100644 --- a/bitnami/mariadb/10.6/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh +++ b/bitnami/mariadb/10.6/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh @@ -112,7 +112,11 @@ is_web_server_running() { ######################### web_server_start() { info "Starting $(web_server_type) in background" - "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/start.sh" + if [[ "$BITNAMI_SERVICE_MANAGER" = "monit" ]]; then + "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/start.sh" + elif [[ "$BITNAMI_SERVICE_MANAGER" = "systemd" ]]; then + systemctl start "bitnami.$(web_server_type).service" + fi } ######################## @@ -126,7 +130,11 @@ web_server_start() { ######################### web_server_stop() { info "Stopping $(web_server_type)" - "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/stop.sh" + if [[ "$BITNAMI_SERVICE_MANAGER" = "monit" ]]; then + "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/stop.sh" + elif [[ "$BITNAMI_SERVICE_MANAGER" = "systemd" ]]; then + systemctl stop "bitnami.$(web_server_type).service" + fi } ######################## @@ -140,7 +148,11 @@ web_server_stop() { ######################### web_server_restart() { info "Restarting $(web_server_type)" - "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/restart.sh" + if [[ "$BITNAMI_SERVICE_MANAGER" = "monit" ]]; then + "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/restart.sh" + elif [[ "$BITNAMI_SERVICE_MANAGER" = "systemd" ]]; then + systemctl restart "bitnami.$(web_server_type).service" + fi } ######################## @@ -153,7 +165,11 @@ web_server_restart() { # None ######################### web_server_reload() { - "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/reload.sh" + if [[ "$BITNAMI_SERVICE_MANAGER" = "monit" ]]; then + "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/reload.sh" + elif [[ "$BITNAMI_SERVICE_MANAGER" = "systemd" ]]; then + systemctl reload "bitnami.$(web_server_type).service" + fi } ########################