From 7fdf2fcbe6ec17ca5dfc07300d9bac18677215ab Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Sun, 19 Mar 2023 01:51:58 +0100 Subject: [PATCH] [bitnami/rails] Release 7.0.4-3-debian-11-r1 (#27725) Signed-off-by: Bitnami Containers --- bitnami/rails/7/debian-11/Dockerfile | 18 ++++---- .../opt/bitnami/.bitnami_components.json | 28 ++++++------- .../opt/bitnami/scripts/libservice.sh | 41 +++++++++++++++++-- bitnami/rails/README.md | 1 - 4 files changed, 60 insertions(+), 28 deletions(-) diff --git a/bitnami/rails/7/debian-11/Dockerfile b/bitnami/rails/7/debian-11/Dockerfile index 593c774e77a2..155fd3b74711 100644 --- a/bitnami/rails/7/debian-11/Dockerfile +++ b/bitnami/rails/7/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-13T22:10:15Z" \ + org.opencontainers.image.created="2023-03-19T00:03:45Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="7.0.4-3-debian-11-r0" \ + org.opencontainers.image.ref.name="7.0.4-3-debian-11-r1" \ org.opencontainers.image.title="rails" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="7.0.4-3" @@ -21,13 +21,13 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN install_packages ca-certificates curl git libaudit1 libbz2-1.0 libcap-ng0 libcom-err2 libcrypt1 libffi7 libgcc-s1 libgmp10 libgnutls30 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblzma5 libmariadb3 libncurses6 libncursesw6 libnettle8 libnsl2 libp11-kit0 libpam0g libpq5 libreadline-dev libreadline8 libsasl2-2 libsqlite3-0 libssl-dev libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libtirpc3 libunistring2 libxml2 libyaml-0-2 procps sqlite3 sudo zlib1g RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ COMPONENTS=( \ - "python-3.8.16-7-linux-${OS_ARCH}-debian-11" \ - "ruby-3.2.1-2-linux-${OS_ARCH}-debian-11" \ - "node-18.15.0-0-linux-${OS_ARCH}-debian-11" \ - "mysql-client-10.6.12-1-linux-${OS_ARCH}-debian-11" \ - "wait-for-port-1.0.6-1-linux-${OS_ARCH}-debian-11" \ - "rails-7.0.4-3-0-linux-${OS_ARCH}-debian-11" \ - "gosu-1.16.0-2-linux-${OS_ARCH}-debian-11" \ + "python-3.8.16-8-linux-${OS_ARCH}-debian-11" \ + "ruby-3.2.1-3-linux-${OS_ARCH}-debian-11" \ + "node-18.15.0-1-linux-${OS_ARCH}-debian-11" \ + "mysql-client-10.6.12-2-linux-${OS_ARCH}-debian-11" \ + "wait-for-port-1.0.6-2-linux-${OS_ARCH}-debian-11" \ + "rails-7.0.4-3-1-linux-${OS_ARCH}-debian-11" \ + "gosu-1.16.0-3-linux-${OS_ARCH}-debian-11" \ ) && \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ diff --git a/bitnami/rails/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/rails/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 992add2f57a5..f599fc344491 100644 --- a/bitnami/rails/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/rails/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -1,51 +1,51 @@ { "gosu": { "arch": "amd64", - "digest": "f6056076afb745fd7d9d87d20f71e7248d63330352cf5ae0be2130b7f44a8cfa", + "digest": "bf2b90a31df691e3648c4a41190a926bb638c3a9fa1dfcde36623ce1bfaadc23", "distro": "debian-11", "type": "NAMI", - "version": "1.16.0-2" + "version": "1.16.0-3" }, "mysql-client": { "arch": "amd64", - "digest": "dbc087bd90a6387956751464da45660229b3e7349b96099805e61dcbc2514853", + "digest": "6ed7c73b5e779521cf2f47a00ac54e6d2929213cb4eb3cbd9a4f12f84557c664", "distro": "debian-11", "type": "NAMI", - "version": "10.6.12-1" + "version": "10.6.12-2" }, "node": { "arch": "amd64", - "digest": "cc1030a32cab4b0f02fd57b2e2e98917779a496ef9ea0eba14e0f4c44b5bebfa", + "digest": "6a3b2d1e7ab2f53f2f70faa3bab6406727c5024f73581294724b97eeb4ee4a2b", "distro": "debian-11", "type": "NAMI", - "version": "18.15.0-0" + "version": "18.15.0-1" }, "python": { "arch": "amd64", - "digest": "a4249f456ce331010413d741375847593c983fba42e31eb6e042db931dedd9f1", + "digest": "faf2f2e22f3ae88f12fb973d60295f7d63fab48c6909ae351e88ee31c5d296c6", "distro": "debian-11", "type": "NAMI", - "version": "3.8.16-7" + "version": "3.8.16-8" }, "rails": { "arch": "amd64", - "digest": "6ed9ba42216fb0f2ae28fe4dda44733cbd7a829b5750b5d16ea41df703c2ac82", + "digest": "9c4cf795e8addd959f8e59fae1657440168f7295dcd1d438d320068696d6fa9e", "distro": "debian-11", "type": "NAMI", - "version": "7.0.4-3-0" + "version": "7.0.4-3-1" }, "ruby": { "arch": "amd64", - "digest": "90adc51a569be9e139983efaa96d6306c59aa7d7cde04761771ca982ec3809b3", + "digest": "835f89f927261080a5bc8081ae67d8eeea45fed5c8225e53bc899c4e647a698f", "distro": "debian-11", "type": "NAMI", - "version": "3.2.1-2" + "version": "3.2.1-3" }, "wait-for-port": { "arch": "amd64", - "digest": "be7c393d598ddf16d1c3c008a67b87879e48aca62071a208583390f2b41e6744", + "digest": "66c83aadf646d230d0cb097d9fe1663911bed94fabf8cbba2a17c39f7c6ffbcc", "distro": "debian-11", "type": "NAMI", - "version": "1.0.6-1" + "version": "1.0.6-2" } } \ No newline at end of file diff --git a/bitnami/rails/7/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/rails/7/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh index 2d53aca9af84..2d4b7af6fd3a 100644 --- a/bitnami/rails/7/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh +++ b/bitnami/rails/7/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh @@ -281,6 +281,8 @@ remove_logrotate_conf() { # --environment - Environment variable to define (multiple --environment options may be passed) # --environment-file - Text file with environment variables # --exec-start - Start command (required) +# --exec-start-pre - Pre-start command (optional) +# --exec-start-post - Post-start command (optional) # --exec-stop - Stop command (optional) # --exec-reload - Reload command (optional) # --group - System group to start the service with @@ -292,6 +294,7 @@ remove_logrotate_conf() { # --success-exit-status - Exit code that indicates a successful shutdown # --type - Systemd unit type (defaults to forking) # --user - System user to start the service with +# --working-directory - Working directory at which to start the service # Returns: # None ######################### @@ -307,6 +310,8 @@ generate_systemd_conf() { local environment="" local environment_file="" local exec_start="" + local exec_start_pre="" + local exec_start_post="" local exec_stop="" local exec_reload="" local restart="always" @@ -316,6 +321,7 @@ generate_systemd_conf() { local limits_content="" local success_exit_status="" local custom_service_content="" + local working_directory="" # Parse CLI flags shift while [[ "$#" -gt 0 ]]; do @@ -334,6 +340,7 @@ generate_systemd_conf() { | --standard-error \ | --success-exit-status \ | --custom-service-content \ + | --working-directory \ ) var_name="$(echo "$1" | sed -e "s/^--//" -e "s/-/_/g")" shift @@ -345,11 +352,21 @@ generate_systemd_conf() { shift limits_content+="Limit${var_name^^}=${1:?"--limit-${var_name} value is missing"}" ;; + --exec-start-pre) + shift + [[ -n "$exec_start_pre" ]] && exec_start_pre+=$'\n' + exec_start_pre+="ExecStartPre=${1:?"--exec-start-pre value is missing"}" + ;; + --exec-start-post) + shift + [[ -n "$exec_start_post" ]] && exec_start_post+=$'\n' + exec_start_post+="ExecStartPost=${1:?"--exec-start-post value is missing"}" + ;; --environment) shift # It is possible to add multiple environment lines [[ -n "$environment" ]] && environment+=$'\n' - environment+="Environment=${1:?"environment" is missing}" + environment+="Environment=${1:?"--environment value is missing"}" ;; *) echo "Invalid command line flag ${1}" >&2 @@ -376,8 +393,21 @@ PartOf=bitnami.service [Service] Type=${type} -ExecStart=${exec_start} EOF + if [[ -n "$working_directory" ]]; then + cat >> "$service_file" <<< "WorkingDirectory=$working_directory" + fi + if [[ -n "$exec_start_pre" ]]; then + # This variable may contain multiple ExecStartPre= directives + cat >> "$service_file" <<< "$exec_start_pre" + fi + if [[ -n "$exec_start" ]]; then + cat >> "$service_file" <<< "ExecStart=${exec_start}" + fi + if [[ -n "$exec_start_post" ]]; then + # This variable may contain multiple ExecStartPost= directives + cat >> "$service_file" <<< "$exec_start_post" + fi # Optional stop and reload commands if [[ -n "$exec_stop" ]]; then cat >> "$service_file" <<< "ExecStop=${exec_stop}" @@ -399,8 +429,9 @@ EOF if [[ -n "$restart" ]]; then cat >> "$service_file" <<< "Restart=${restart}" fi - # Environment flags (may be specified multiple times in a unit) + # Environment flags if [[ -n "$environment" ]]; then + # This variable may contain multiple Environment= directives cat >> "$service_file" <<< "$environment" fi if [[ -n "$environment_file" ]]; then @@ -414,6 +445,7 @@ EOF cat >> "$service_file" <<< "StandardError=${standard_error}" fi if [[ -n "$custom_service_content" ]]; then + # This variable may contain multiple miscellaneous directives cat >> "$service_file" <<< "$custom_service_content" fi if [[ -n "$success_exit_status" ]]; then @@ -424,7 +456,8 @@ EOF fi cat >> "$service_file" < Rails is a web application framework running on the Ruby programming language. [Overview of Rails](http://rubyonrails.org/) - Trademarks: This software listing is packaged by Bitnami. The respective trademarks mentioned in the offering are owned by the respective companies, and use of them does not imply any affiliation or endorsement. ## TL;DR