[bitnami/openresty] Release 1.21.4-1-debian-11-r103 (#28984)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
This commit is contained in:
Bitnami Bot
2023-04-01 19:16:00 +02:00
committed by GitHub
parent efee1fa4bd
commit 3d446d613e
3 changed files with 15 additions and 9 deletions

View File

@@ -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-28T02:52:11Z" \
org.opencontainers.image.created="2023-04-01T16:59:45Z" \
org.opencontainers.image.description="Application packaged by VMware, Inc" \
org.opencontainers.image.licenses="Apache-2.0" \
org.opencontainers.image.ref.name="1.21.4-1-debian-11-r102" \
org.opencontainers.image.ref.name="1.21.4-1-debian-11-r103" \
org.opencontainers.image.title="openresty" \
org.opencontainers.image.vendor="VMware, Inc." \
org.opencontainers.image.version="1.21.4-1"
@@ -22,8 +22,8 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
RUN install_packages ca-certificates curl libbrotli1 libbsd0 libcrypt1 libdeflate0 libexpat1 libfontconfig1 libfreetype6 libgcc-s1 libgcrypt20 libgd3 libgeoip1 libgpg-error0 libicu67 libjbig0 libjpeg62-turbo liblzma5 libmd0 libpcre3 libpng16-16 libssl1.1 libstdc++6 libtiff5 libuuid1 libwebp6 libx11-6 libxau6 libxcb1 libxdmcp6 libxml2 libxpm4 libxslt1.1 libzstd1 perl procps zlib1g
RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
COMPONENTS=( \
"openresty-1.21.4-1-160-linux-${OS_ARCH}-debian-11" \
"gosu-1.16.0-3-linux-${OS_ARCH}-debian-11" \
"openresty-1.21.4-1-162-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,12 +3,12 @@
"arch": "amd64",
"distro": "debian-11",
"type": "NAMI",
"version": "1.16.0-3"
"version": "1.16.0-5"
},
"openresty": {
"arch": "amd64",
"distro": "debian-11",
"type": "NAMI",
"version": "1.21.4-1-160"
"version": "1.21.4-1-162"
}
}

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