[bitnami/spring-cloud-dataflow] Release 2.10.2-debian-11-r6 (#28963)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
This commit is contained in:
Bitnami Bot 2023-04-01 17:19:26 +02:00 committed by GitHub
parent c2a589c565
commit a7b0393370
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 13 deletions

View File

@ -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-27T15:02:27Z" \
org.opencontainers.image.created="2023-04-01T14:46:09Z" \
org.opencontainers.image.description="Application packaged by VMware, Inc" \
org.opencontainers.image.licenses="Apache-2.0" \
org.opencontainers.image.ref.name="2.10.2-debian-11-r5" \
org.opencontainers.image.ref.name="2.10.2-debian-11-r6" \
org.opencontainers.image.title="spring-cloud-dataflow" \
org.opencontainers.image.vendor="VMware, Inc." \
org.opencontainers.image.version="2.10.2"
@ -23,10 +23,10 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
RUN install_packages ca-certificates curl libgcc-s1 procps
RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
COMPONENTS=( \
"java-1.8.362-3-linux-${OS_ARCH}-debian-11" \
"yq-4.33.1-0-linux-${OS_ARCH}-debian-11" \
"spring-cloud-dataflow-2.10.2-1-linux-${OS_ARCH}-debian-11" \
"gosu-1.16.0-3-linux-${OS_ARCH}-debian-11" \
"java-1.8.362-4-linux-${OS_ARCH}-debian-11" \
"yq-4.33.2-0-linux-${OS_ARCH}-debian-11" \
"spring-cloud-dataflow-2.10.2-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 \

View File

@ -3,24 +3,24 @@
"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": "1.8.362-3"
"version": "1.8.362-4"
},
"spring-cloud-dataflow": {
"arch": "amd64",
"distro": "debian-11",
"type": "NAMI",
"version": "2.10.2-1"
"version": "2.10.2-3"
},
"yq": {
"arch": "amd64",
"distro": "debian-11",
"type": "NAMI",
"version": "4.33.1-0"
"version": "4.33.2-0"
}
}

View File

@ -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