[bitnami/nginx] Release 1.22.1-debian-11-r41 (#24301)
Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
This commit is contained in:
parent
20345ffbd9
commit
587edf37f3
|
|
@ -2,11 +2,11 @@ FROM docker.io/bitnami/minideb:bullseye
|
|||
|
||||
ARG TARGETARCH
|
||||
|
||||
LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \
|
||||
org.opencontainers.image.description="Application packaged by Bitnami" \
|
||||
LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
|
||||
org.opencontainers.image.created="2023-02-17T16:10:04Z" \
|
||||
org.opencontainers.image.description="Application packaged by VMware, Inc" \
|
||||
org.opencontainers.image.licenses="Apache-2.0" \
|
||||
org.opencontainers.image.ref.name="1.22.1-debian-11-r40" \
|
||||
org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/nginx" \
|
||||
org.opencontainers.image.ref.name="1.22.1-debian-11-r41" \
|
||||
org.opencontainers.image.title="nginx" \
|
||||
org.opencontainers.image.vendor="VMware, Inc." \
|
||||
org.opencontainers.image.version="1.22.1"
|
||||
|
|
@ -22,9 +22,9 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
|
|||
RUN install_packages ca-certificates curl libcrypt1 libgeoip1 libpcre3 libssl1.1 procps zlib1g
|
||||
RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
|
||||
COMPONENTS=( \
|
||||
"render-template-1.0.5-0-linux-${OS_ARCH}-debian-11" \
|
||||
"nginx-1.22.1-3-linux-${OS_ARCH}-debian-11" \
|
||||
"gosu-1.16.0-1-linux-${OS_ARCH}-debian-11" \
|
||||
"render-template-1.0.5-1-linux-${OS_ARCH}-debian-11" \
|
||||
"nginx-1.22.1-4-linux-${OS_ARCH}-debian-11" \
|
||||
"gosu-1.16.0-2-linux-${OS_ARCH}-debian-11" \
|
||||
) && \
|
||||
for COMPONENT in "${COMPONENTS[@]}"; do \
|
||||
if [ ! -f "${COMPONENT}.tar.gz" ]; then \
|
||||
|
|
|
|||
|
|
@ -1,23 +1,23 @@
|
|||
{
|
||||
"gosu": {
|
||||
"arch": "amd64",
|
||||
"digest": "9ab9654690d90d3c49ff66fb1eb286487e318adc899d036bc45922f6b176865b",
|
||||
"digest": "f6056076afb745fd7d9d87d20f71e7248d63330352cf5ae0be2130b7f44a8cfa",
|
||||
"distro": "debian-11",
|
||||
"type": "NAMI",
|
||||
"version": "1.16.0-1"
|
||||
"version": "1.16.0-2"
|
||||
},
|
||||
"nginx": {
|
||||
"arch": "amd64",
|
||||
"digest": "e9513475c6905b85e67c9e3d267b28c50308dc3d79b78f2c994c378b5ab1b4a4",
|
||||
"digest": "52b14b98f435b58a27bf850db44580c5a8c60ea475384b2f0af0621b4f67b74b",
|
||||
"distro": "debian-11",
|
||||
"type": "NAMI",
|
||||
"version": "1.22.1-3"
|
||||
"version": "1.22.1-4"
|
||||
},
|
||||
"render-template": {
|
||||
"arch": "amd64",
|
||||
"digest": "57c1d857acbb187fcb98f4ba26d138af9d866f59ad38dd443a75c0a6422de994",
|
||||
"digest": "185e277977366ec222d2bde1a395ffa138ce1a9d3bdf1df20c3e49e8b8f9c68b",
|
||||
"distro": "debian-11",
|
||||
"type": "NAMI",
|
||||
"version": "1.0.5-0"
|
||||
"version": "1.0.5-1"
|
||||
}
|
||||
}
|
||||
|
|
@ -196,7 +196,7 @@ nginx_initialize() {
|
|||
nginx_configure_port "$NGINX_HTTP_PORT_NUMBER"
|
||||
fi
|
||||
# Configure HTTPS port number
|
||||
if [[ -n "${NGINX_HTTPS_PORT_NUMBER:-}" ]]; then
|
||||
if [[ -n "${NGINX_HTTPS_PORT_NUMBER:-}" ]] && [[ -f "${NGINX_SERVER_BLOCKS_DIR}/default-https-server-block.conf" ]]; then
|
||||
nginx_configure_port "$NGINX_HTTPS_PORT_NUMBER" "${NGINX_SERVER_BLOCKS_DIR}/default-https-server-block.conf"
|
||||
fi
|
||||
nginx_configure "absolute_redirect" "$(is_boolean_yes "$NGINX_ENABLE_ABSOLUTE_REDIRECT" && echo "on" || echo "off" )"
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ nginx_custom_init_scripts
|
|||
! am_i_root || chmod o+w "$(readlink /dev/stdout)" "$(readlink /dev/stderr)"
|
||||
|
||||
# Configure HTTPS port number
|
||||
if [[ -n "${NGINX_HTTPS_PORT_NUMBER:-}" ]] && [[ ! -f "${NGINX_SERVER_BLOCKS_DIR}/default-https-server-block.conf" ]] || is_dir_empty "${NGINX_SERVER_BLOCKS_DIR}"; then
|
||||
if [[ -n "${NGINX_HTTPS_PORT_NUMBER:-}" ]] && [[ ! -f "${NGINX_SERVER_BLOCKS_DIR}/default-https-server-block.conf" ]] && is_file_writable "${NGINX_SERVER_BLOCKS_DIR}/default-https-server-block.conf"; then
|
||||
cp "${BITNAMI_ROOT_DIR}/scripts/nginx/server_blocks/default-https-server-block.conf" "${NGINX_SERVER_BLOCKS_DIR}/default-https-server-block.conf"
|
||||
fi
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue