[bitnami/reportserver] Release 4.5.0-6087-debian-11-r12 (#28916)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
This commit is contained in:
Bitnami Bot
2023-04-01 16:51:41 +02:00
committed by GitHub
parent 931acc558e
commit 6edcbc2fc2
3 changed files with 23 additions and 17 deletions

View File

@@ -4,10 +4,10 @@ ARG JAVA_EXTRA_SECURITY_DIR="/bitnami/java/extra-security"
ARG TARGETARCH ARG TARGETARCH
LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ 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.description="Application packaged by VMware, Inc" \
org.opencontainers.image.licenses="Apache-2.0" \ 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.title="reportserver" \
org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.vendor="VMware, Inc." \
org.opencontainers.image.version="4.5.0-6087" 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 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/ && \ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
COMPONENTS=( \ COMPONENTS=( \
"java-11.0.18-10-3-linux-${OS_ARCH}-debian-11" \ "java-11.0.18-10-4-linux-${OS_ARCH}-debian-11" \
"tomcat-9.0.73-1-linux-${OS_ARCH}-debian-11" \ "tomcat-9.0.73-3-linux-${OS_ARCH}-debian-11" \
"mysql-client-10.6.12-2-linux-${OS_ARCH}-debian-11" \ "mysql-client-10.6.12-4-linux-${OS_ARCH}-debian-11" \
"reportserver-4.5.0-6087-2-linux-${OS_ARCH}-debian-11" \ "reportserver-4.5.0-6087-4-linux-${OS_ARCH}-debian-11" \
"render-template-1.0.5-2-linux-${OS_ARCH}-debian-11" \ "render-template-1.0.5-4-linux-${OS_ARCH}-debian-11" \
"gosu-1.16.0-3-linux-${OS_ARCH}-debian-11" \ "gosu-1.16.0-5-linux-${OS_ARCH}-debian-11" \
) && \ ) && \
for COMPONENT in "${COMPONENTS[@]}"; do \ for COMPONENT in "${COMPONENTS[@]}"; do \
if [ ! -f "${COMPONENT}.tar.gz" ]; then \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \

View File

@@ -3,36 +3,36 @@
"arch": "amd64", "arch": "amd64",
"distro": "debian-11", "distro": "debian-11",
"type": "NAMI", "type": "NAMI",
"version": "1.16.0-3" "version": "1.16.0-5"
}, },
"java": { "java": {
"arch": "amd64", "arch": "amd64",
"distro": "debian-11", "distro": "debian-11",
"type": "NAMI", "type": "NAMI",
"version": "11.0.18-10-3" "version": "11.0.18-10-4"
}, },
"mysql-client": { "mysql-client": {
"arch": "amd64", "arch": "amd64",
"distro": "debian-11", "distro": "debian-11",
"type": "NAMI", "type": "NAMI",
"version": "10.6.12-2" "version": "10.6.12-4"
}, },
"render-template": { "render-template": {
"arch": "amd64", "arch": "amd64",
"distro": "debian-11", "distro": "debian-11",
"type": "NAMI", "type": "NAMI",
"version": "1.0.5-2" "version": "1.0.5-4"
}, },
"reportserver": { "reportserver": {
"arch": "amd64", "arch": "amd64",
"distro": "debian-11", "distro": "debian-11",
"type": "NAMI", "type": "NAMI",
"version": "4.5.0-6087-2" "version": "4.5.0-6087-4"
}, },
"tomcat": { "tomcat": {
"arch": "amd64", "arch": "amd64",
"distro": "debian-11", "distro": "debian-11",
"type": "NAMI", "type": "NAMI",
"version": "9.0.73-1" "version": "9.0.73-3"
} }
} }

View File

@@ -279,7 +279,7 @@ remove_logrotate_conf() {
# Flags: # Flags:
# --custom-service-content - Custom content to add to the [service] block # --custom-service-content - Custom content to add to the [service] block
# --environment - Environment variable to define (multiple --environment options may be passed) # --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 - Start command (required)
# --exec-start-pre - Pre-start command (optional) # --exec-start-pre - Pre-start command (optional)
# --exec-start-post - Post-start command (optional) # --exec-start-post - Post-start command (optional)
@@ -330,7 +330,6 @@ generate_systemd_conf() {
| --type \ | --type \
| --user \ | --user \
| --group \ | --group \
| --environment-file \
| --exec-start \ | --exec-start \
| --exec-stop \ | --exec-stop \
| --exec-reload \ | --exec-reload \
@@ -368,6 +367,12 @@ generate_systemd_conf() {
[[ -n "$environment" ]] && environment+=$'\n' [[ -n "$environment" ]] && environment+=$'\n'
environment+="Environment=${1:?"--environment value is missing"}" 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 echo "Invalid command line flag ${1}" >&2
return 1 return 1
@@ -435,7 +440,8 @@ EOF
cat >> "$service_file" <<< "$environment" cat >> "$service_file" <<< "$environment"
fi fi
if [[ -n "$environment_file" ]]; then if [[ -n "$environment_file" ]]; then
cat >> "$service_file" <<< "EnvironmentFile=${environment_file}" # This variable may contain multiple EnvironmentFile= directives
cat >> "$service_file" <<< "$environment_file"
fi fi
# Logging # Logging
if [[ -n "$standard_output" ]]; then if [[ -n "$standard_output" ]]; then