From 6edcbc2fc2cb9d009a59a3a7fbce7f35cf49df3f Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Sat, 1 Apr 2023 16:51:41 +0200 Subject: [PATCH] [bitnami/reportserver] Release 4.5.0-6087-debian-11-r12 (#28916) Signed-off-by: Bitnami Containers --- bitnami/reportserver/4/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/reportserver/4/debian-11/Dockerfile b/bitnami/reportserver/4/debian-11/Dockerfile index 74fc4cbd38ea..b20e9bfed634 100644 --- a/bitnami/reportserver/4/debian-11/Dockerfile +++ b/bitnami/reportserver/4/debian-11/Dockerfile @@ -4,10 +4,10 @@ ARG JAVA_EXTRA_SECURITY_DIR="/bitnami/java/extra-security" ARG TARGETARCH LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-03-28T17:24:11Z" \ + org.opencontainers.image.created="2023-04-01T13:38:24Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="4.5.0-6087-debian-11-r11" \ + org.opencontainers.image.ref.name="4.5.0-6087-debian-11-r12" \ org.opencontainers.image.title="reportserver" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="4.5.0-6087" @@ -23,12 +23,12 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN install_packages ca-certificates curl libaudit1 libcap-ng0 libgcc-s1 libicu67 liblzma5 libncurses6 libpam0g libssl1.1 libstdc++6 libtinfo6 libxml2 procps xmlstarlet zlib1g RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ COMPONENTS=( \ - "java-11.0.18-10-3-linux-${OS_ARCH}-debian-11" \ - "tomcat-9.0.73-1-linux-${OS_ARCH}-debian-11" \ - "mysql-client-10.6.12-2-linux-${OS_ARCH}-debian-11" \ - "reportserver-4.5.0-6087-2-linux-${OS_ARCH}-debian-11" \ - "render-template-1.0.5-2-linux-${OS_ARCH}-debian-11" \ - "gosu-1.16.0-3-linux-${OS_ARCH}-debian-11" \ + "java-11.0.18-10-4-linux-${OS_ARCH}-debian-11" \ + "tomcat-9.0.73-3-linux-${OS_ARCH}-debian-11" \ + "mysql-client-10.6.12-4-linux-${OS_ARCH}-debian-11" \ + "reportserver-4.5.0-6087-4-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.5-4-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/reportserver/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/reportserver/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 85e07b52098a..7fecda1d15d5 100644 --- a/bitnami/reportserver/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/reportserver/4/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" }, "java": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "11.0.18-10-3" + "version": "11.0.18-10-4" }, "mysql-client": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "10.6.12-2" + "version": "10.6.12-4" }, "render-template": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.5-2" + "version": "1.0.5-4" }, "reportserver": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "4.5.0-6087-2" + "version": "4.5.0-6087-4" }, "tomcat": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "9.0.73-1" + "version": "9.0.73-3" } } \ No newline at end of file diff --git a/bitnami/reportserver/4/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/reportserver/4/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh index 6fcb304d34cc..d70cf0779ec8 100644 --- a/bitnami/reportserver/4/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh +++ b/bitnami/reportserver/4/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