diff --git a/bitnami/rails/6/debian-11/Dockerfile b/bitnami/rails/6/debian-11/Dockerfile index 81baf57117b3..c7500f57fa08 100644 --- a/bitnami/rails/6/debian-11/Dockerfile +++ b/bitnami/rails/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-22T00:47:13Z" \ + org.opencontainers.image.created="2023-03-28T05:58:35Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="6.1.7-3-debian-11-r2" \ + org.opencontainers.image.ref.name="6.1.7-3-debian-11-r3" \ org.opencontainers.image.title="rails" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="6.1.7-3" diff --git a/bitnami/rails/6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/rails/6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 8062c3ef206e..ebe27fae4332 100644 --- a/bitnami/rails/6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/rails/6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -1,49 +1,42 @@ { "gosu": { "arch": "amd64", - "digest": "bf2b90a31df691e3648c4a41190a926bb638c3a9fa1dfcde36623ce1bfaadc23", "distro": "debian-11", "type": "NAMI", "version": "1.16.0-3" }, "mysql-client": { "arch": "amd64", - "digest": "6ed7c73b5e779521cf2f47a00ac54e6d2929213cb4eb3cbd9a4f12f84557c664", "distro": "debian-11", "type": "NAMI", "version": "10.6.12-2" }, "node": { "arch": "amd64", - "digest": "6a3b2d1e7ab2f53f2f70faa3bab6406727c5024f73581294724b97eeb4ee4a2b", "distro": "debian-11", "type": "NAMI", "version": "18.15.0-1" }, "python": { "arch": "amd64", - "digest": "faf2f2e22f3ae88f12fb973d60295f7d63fab48c6909ae351e88ee31c5d296c6", "distro": "debian-11", "type": "NAMI", "version": "3.8.16-8" }, "rails": { "arch": "amd64", - "digest": "1d4cc64c9f17dda213ff943d36327e876fe963abf1189116fd53b7c128eeda31", "distro": "debian-11", "type": "NAMI", "version": "6.1.7-3-1" }, "ruby": { "arch": "amd64", - "digest": "196bdd3288ef846ab68d063edf64b898f58546e8aad3302ce24282de4c2f62d4", "distro": "debian-11", "type": "NAMI", "version": "2.7.7-5" }, "wait-for-port": { "arch": "amd64", - "digest": "66c83aadf646d230d0cb097d9fe1663911bed94fabf8cbba2a17c39f7c6ffbcc", "distro": "debian-11", "type": "NAMI", "version": "1.0.6-2" diff --git a/bitnami/rails/6/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/rails/6/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh index 2d4b7af6fd3a..6fcb304d34cc 100644 --- a/bitnami/rails/6/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh +++ b/bitnami/rails/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/rails/6/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/rails/6/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh index 818c2158032b..5860791219cf 100644 --- a/bitnami/rails/6/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh +++ b/bitnami/rails/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 } ########################