diff --git a/bitnami/rails/6/debian-11/Dockerfile b/bitnami/rails/6/debian-11/Dockerfile index 482f5ece0ac4..045d751a4cb9 100644 --- a/bitnami/rails/6/debian-11/Dockerfile +++ b/bitnami/rails/6/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-08-28T06:02:26Z" \ + org.opencontainers.image.created="2023-08-31T11:09:43Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="6.1.7-6-debian-11-r5" \ + org.opencontainers.image.ref.name="6.1.7-6-debian-11-r8" \ org.opencontainers.image.title="rails" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="6.1.7-6" @@ -25,7 +25,7 @@ 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 procps sqlite3 sudo zlib1g RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ COMPONENTS=( \ - "python-3.9.18-0-linux-${OS_ARCH}-debian-11" \ + "python-3.9.18-1-linux-${OS_ARCH}-debian-11" \ "ruby-2.7.8-5-linux-${OS_ARCH}-debian-11" \ "node-18.17.1-1-linux-${OS_ARCH}-debian-11" \ "mysql-client-10.11.5-1-linux-${OS_ARCH}-debian-11" \ 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 76e71e8b2f98..f8d2031f9b8c 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 @@ -15,7 +15,7 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.9.18-0" + "version": "3.9.18-1" }, "rails": { "arch": "amd64", diff --git a/bitnami/rails/6/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh b/bitnami/rails/6/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh index 54987abca42a..16183f62d080 100644 --- a/bitnami/rails/6/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh +++ b/bitnami/rails/6/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh @@ -4,7 +4,7 @@ # # Validation functions library -# shellcheck disable=SC1091 +# shellcheck disable=SC1091,SC2086 # Load Generic Libraries . /opt/bitnami/scripts/liblog.sh @@ -203,7 +203,7 @@ validate_ipv6() { if [[ $ip =~ $full_address_regex || $ip =~ $short_address_regex || $ip == "::" ]]; then stat=0 fi - return "$stat" + return $stat } ######################## @@ -223,7 +223,7 @@ validate_ipv4() { && ${ip_array[2]} -le 255 && ${ip_array[3]} -le 255 ]] stat=$? fi - return "$stat" + return $stat } ######################## @@ -242,7 +242,7 @@ validate_ip() { else stat=$(validate_ipv6 "$ip") fi - return "$stat" + return $stat } ######################## diff --git a/bitnami/rails/6/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/rails/6/debian-11/prebuildfs/usr/sbin/run-script new file mode 100755 index 000000000000..4ca0f897277e --- /dev/null +++ b/bitnami/rails/6/debian-11/prebuildfs/usr/sbin/run-script @@ -0,0 +1,24 @@ +#!/bin/sh +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 +set -u + +if [ $# -eq 0 ]; then + >&2 echo "No arguments provided" + exit 1 +fi + +script=$1 +exit_code="${2:-96}" +fail_if_not_present="${3:-n}" + +if test -f "$script"; then + sh $script + + if [ $? -ne 0 ]; then + exit $((exit_code)) + fi +elif [ "$fail_if_not_present" = "y" ]; then + >&2 echo "script not found: $script" + exit 127 +fi