From 61b6d3d71acc2102086254370146e16dc1cc231d Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Sat, 1 Apr 2023 19:01:17 +0200 Subject: [PATCH] [bitnami/redmine] Release 5.0.5-debian-11-r7 (#28978) Signed-off-by: Bitnami Containers --- bitnami/redmine/5/debian-11/Dockerfile | 16 ++++++++-------- .../opt/bitnami/.bitnami_components.json | 12 ++++++------ .../prebuildfs/opt/bitnami/scripts/libservice.sh | 12 +++++++++--- 3 files changed, 23 insertions(+), 17 deletions(-) diff --git a/bitnami/redmine/5/debian-11/Dockerfile b/bitnami/redmine/5/debian-11/Dockerfile index b7226b2e5fbe..2ea91f8c3d2b 100644 --- a/bitnami/redmine/5/debian-11/Dockerfile +++ b/bitnami/redmine/5/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-28T15:13:47Z" \ + org.opencontainers.image.created="2023-04-01T16:19:39Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="5.0.5-debian-11-r6" \ + org.opencontainers.image.ref.name="5.0.5-debian-11-r7" \ org.opencontainers.image.title="redmine" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="5.0.5" @@ -22,12 +22,12 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN install_packages acl ca-certificates curl ghostscript git gsfonts imagemagick libaudit1 libbsd0 libcap-ng0 libcom-err2 libcrypt1 libedit2 libffi7 libgcc-s1 libgmp10 libgnutls30 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblzma5 libmariadb3 libmd0 libncurses6 libnettle8 libp11-kit0 libpam0g libpq5 libreadline-dev libreadline8 libsasl2-2 libssl-dev libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libunistring2 libuuid1 libxml2 libxslt1.1 procps sqlite3 zlib1g RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ COMPONENTS=( \ - "yq-4.33.1-0-linux-${OS_ARCH}-debian-11" \ - "ruby-3.0.5-5-linux-${OS_ARCH}-debian-11" \ - "postgresql-client-15.2.0-2-linux-${OS_ARCH}-debian-11" \ - "mysql-client-10.6.12-2-linux-${OS_ARCH}-debian-11" \ - "redmine-5.0.5-1-linux-${OS_ARCH}-debian-11" \ - "gosu-1.16.0-3-linux-${OS_ARCH}-debian-11" \ + "yq-4.33.2-0-linux-${OS_ARCH}-debian-11" \ + "ruby-3.0.6-0-linux-${OS_ARCH}-debian-11" \ + "postgresql-client-15.2.0-4-linux-${OS_ARCH}-debian-11" \ + "mysql-client-10.6.12-4-linux-${OS_ARCH}-debian-11" \ + "redmine-5.0.5-3-linux-${OS_ARCH}-debian-11" \ + "gosu-1.16.0-5-linux-${OS_ARCH}-debian-11" \ ) && \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ diff --git a/bitnami/redmine/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/redmine/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 865e5a2bb2e6..f8fa1b0e16c8 100644 --- a/bitnami/redmine/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/redmine/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,36 +3,36 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.16.0-3" + "version": "1.16.0-5" }, "mysql-client": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "10.6.12-2" + "version": "10.6.12-4" }, "postgresql-client": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "15.2.0-2" + "version": "15.2.0-4" }, "redmine": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "5.0.5-1" + "version": "5.0.5-3" }, "ruby": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.0.5-5" + "version": "3.0.6-0" }, "yq": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "4.33.1-0" + "version": "4.33.2-0" } } \ No newline at end of file diff --git a/bitnami/redmine/5/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/redmine/5/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh index 6fcb304d34cc..d70cf0779ec8 100644 --- a/bitnami/redmine/5/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh +++ b/bitnami/redmine/5/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh @@ -279,7 +279,7 @@ remove_logrotate_conf() { # Flags: # --custom-service-content - Custom content to add to the [service] block # --environment - Environment variable to define (multiple --environment options may be passed) -# --environment-file - Text file with environment variables +# --environment-file - Text file with environment variables (multiple --environment-file options may be passed) # --exec-start - Start command (required) # --exec-start-pre - Pre-start command (optional) # --exec-start-post - Post-start command (optional) @@ -330,7 +330,6 @@ generate_systemd_conf() { | --type \ | --user \ | --group \ - | --environment-file \ | --exec-start \ | --exec-stop \ | --exec-reload \ @@ -368,6 +367,12 @@ generate_systemd_conf() { [[ -n "$environment" ]] && environment+=$'\n' environment+="Environment=${1:?"--environment value is missing"}" ;; + --environment-file) + shift + # It is possible to add multiple environment-file lines + [[ -n "$environment_file" ]] && environment_file+=$'\n' + environment_file+="EnvironmentFile=${1:?"--environment-file value is missing"}" + ;; *) echo "Invalid command line flag ${1}" >&2 return 1 @@ -435,7 +440,8 @@ EOF cat >> "$service_file" <<< "$environment" fi if [[ -n "$environment_file" ]]; then - cat >> "$service_file" <<< "EnvironmentFile=${environment_file}" + # This variable may contain multiple EnvironmentFile= directives + cat >> "$service_file" <<< "$environment_file" fi # Logging if [[ -n "$standard_output" ]]; then