diff --git a/bitnami/rails/7/debian-11/Dockerfile b/bitnami/rails/7/debian-11/Dockerfile index 715617c3d719..16b6351e99c8 100644 --- a/bitnami/rails/7/debian-11/Dockerfile +++ b/bitnami/rails/7/debian-11/Dockerfile @@ -6,13 +6,13 @@ FROM docker.io/bitnami/minideb:bullseye ARG TARGETARCH LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-06-27T05:34:04Z" \ + org.opencontainers.image.created="2023-06-29T22:46:36Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="7.0.5-1-debian-11-r0" \ + org.opencontainers.image.ref.name="7.0.6-0-debian-11-r0" \ org.opencontainers.image.title="rails" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="7.0.5-1" + org.opencontainers.image.version="7.0.6-0" ENV OS_ARCH="${TARGETARCH:-amd64}" \ OS_FLAVOUR="debian-11" \ @@ -28,8 +28,8 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ "ruby-3.2.2-2-linux-${OS_ARCH}-debian-11" \ "node-18.16.1-0-linux-${OS_ARCH}-debian-11" \ "mysql-client-10.11.4-0-linux-${OS_ARCH}-debian-11" \ - "wait-for-port-1.0.6-8-linux-${OS_ARCH}-debian-11" \ - "rails-7.0.5-1-0-linux-${OS_ARCH}-debian-11" \ + "wait-for-port-1.0.6-9-linux-${OS_ARCH}-debian-11" \ + "rails-7.0.6-0-0-linux-${OS_ARCH}-debian-11" \ ) && \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ @@ -46,7 +46,7 @@ RUN /build/bitnami-user.sh COPY rootfs / RUN /opt/bitnami/scripts/rails/postunpack.sh -ENV APP_VERSION="7.0.5-1" \ +ENV APP_VERSION="7.0.6-0" \ BITNAMI_APP_NAME="rails" \ PATH="/opt/bitnami/python/bin:/opt/bitnami/ruby/bin:/opt/bitnami/node/bin:/opt/bitnami/mysql/bin:/opt/bitnami/common/bin:$PATH" 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 f99de0010816..fd3c62106aa9 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 @@ -21,7 +21,7 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "7.0.5-1-0" + "version": "7.0.6-0-0" }, "ruby": { "arch": "amd64", @@ -33,6 +33,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.6-8" + "version": "1.0.6-9" } } \ 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 08fffa531ef1..107f54e6b5c9 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 @@ -106,8 +106,6 @@ generate_cron_conf() { local schedule="* * * * *" local clean="true" - local clean="true" - # Parse optional CLI flags shift 2 while [[ "$#" -gt 0 ]]; do @@ -133,7 +131,12 @@ generate_cron_conf() { mkdir -p /etc/cron.d if "$clean"; then - echo "${schedule} ${run_as} ${cmd}" > /etc/cron.d/"$service_name" + cat > "/etc/cron.d/${service_name}" <> /etc/cron.d/"$service_name" fi @@ -189,7 +192,10 @@ generate_monit_conf() { is_boolean_yes "$disabled" && conf_suffix=".disabled" mkdir -p "$monit_conf_dir" - cat >"${monit_conf_dir}/${service_name}.conf${conf_suffix:-}" < "${monit_conf_dir}/${service_name}.conf${conf_suffix:-}" <"${logrotate_conf_dir}/${service_name}" + cat < "${logrotate_conf_dir}/${service_name}" +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + ${log_path} { ${period} rotate ${rotations} @@ -393,6 +402,9 @@ generate_systemd_conf() { fi # Generate the Systemd unit cat > "$service_file" <