From 955c8456bda2d772aa57795a9eb10591959cc2fb Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Mon, 13 May 2024 13:14:59 +0200 Subject: [PATCH] [bitnami/nginx] Release 1.25.5-debian-12-r3 (#66608) Signed-off-by: Bitnami Containers --- bitnami/nginx/1.25/debian-12/Dockerfile | 12 ++++++------ bitnami/nginx/1.25/debian-12/docker-compose.yml | 2 +- .../prebuildfs/opt/bitnami/.bitnami_components.json | 2 +- .../prebuildfs/opt/bitnami/scripts/libbitnami.sh | 2 +- .../prebuildfs/opt/bitnami/scripts/libfile.sh | 2 +- .../prebuildfs/opt/bitnami/scripts/libfs.sh | 2 +- .../prebuildfs/opt/bitnami/scripts/libhook.sh | 2 +- .../prebuildfs/opt/bitnami/scripts/liblog.sh | 2 +- .../prebuildfs/opt/bitnami/scripts/libnet.sh | 2 +- .../prebuildfs/opt/bitnami/scripts/libos.sh | 2 +- .../prebuildfs/opt/bitnami/scripts/libpersistence.sh | 2 +- .../prebuildfs/opt/bitnami/scripts/libservice.sh | 10 +++++----- .../prebuildfs/opt/bitnami/scripts/libvalidations.sh | 2 +- .../prebuildfs/opt/bitnami/scripts/libversion.sh | 2 +- .../prebuildfs/opt/bitnami/scripts/libwebserver.sh | 2 +- .../debian-12/prebuildfs/usr/sbin/install_packages | 2 +- .../1.25/debian-12/prebuildfs/usr/sbin/run-script | 2 +- .../debian-12/rootfs/opt/bitnami/scripts/libnginx.sh | 2 +- .../rootfs/opt/bitnami/scripts/nginx-env.sh | 2 +- .../rootfs/opt/bitnami/scripts/nginx/entrypoint.sh | 2 +- .../rootfs/opt/bitnami/scripts/nginx/postunpack.sh | 2 +- .../rootfs/opt/bitnami/scripts/nginx/reload.sh | 2 +- .../rootfs/opt/bitnami/scripts/nginx/restart.sh | 2 +- .../rootfs/opt/bitnami/scripts/nginx/run.sh | 2 +- .../rootfs/opt/bitnami/scripts/nginx/setup.sh | 2 +- .../rootfs/opt/bitnami/scripts/nginx/start.sh | 2 +- .../rootfs/opt/bitnami/scripts/nginx/status.sh | 2 +- .../rootfs/opt/bitnami/scripts/nginx/stop.sh | 2 +- bitnami/nginx/1.25/debian-12/tags-info.yaml | 1 - 29 files changed, 37 insertions(+), 38 deletions(-) diff --git a/bitnami/nginx/1.25/debian-12/Dockerfile b/bitnami/nginx/1.25/debian-12/Dockerfile index 17a1395a6a63..3a33ac068dd7 100644 --- a/bitnami/nginx/1.25/debian-12/Dockerfile +++ b/bitnami/nginx/1.25/debian-12/Dockerfile @@ -1,4 +1,4 @@ -# Copyright VMware, Inc. +# Copyright Broadcom, Inc. All Rights Reserved. # SPDX-License-Identifier: APACHE-2.0 FROM docker.io/bitnami/minideb:bookworm @@ -7,14 +7,14 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \ - org.opencontainers.image.created="2024-05-04T11:05:05Z" \ - org.opencontainers.image.description="Application packaged by VMware, Inc" \ + org.opencontainers.image.created="2024-05-13T10:25:09Z" \ + org.opencontainers.image.description="Application packaged by Broadcom, Inc." \ org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/nginx/README.md" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.25.5-debian-12-r2" \ + org.opencontainers.image.ref.name="1.25.5-debian-12-r3" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/nginx" \ org.opencontainers.image.title="nginx" \ - org.opencontainers.image.vendor="VMware, Inc." \ + org.opencontainers.image.vendor="Broadcom, Inc." \ org.opencontainers.image.version="1.25.5" ENV HOME="/" \ @@ -28,7 +28,7 @@ SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] RUN install_packages ca-certificates curl gettext libcrypt1 libgeoip1 libpcre3 libssl3 openssl procps zlib1g RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "render-template-1.0.6-11-linux-${OS_ARCH}-debian-12" \ + "render-template-1.0.6-12-linux-${OS_ARCH}-debian-12" \ "nginx-1.25.5-0-linux-${OS_ARCH}-debian-12" \ ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ diff --git a/bitnami/nginx/1.25/debian-12/docker-compose.yml b/bitnami/nginx/1.25/debian-12/docker-compose.yml index d1a140c5270d..a6b321184b70 100644 --- a/bitnami/nginx/1.25/debian-12/docker-compose.yml +++ b/bitnami/nginx/1.25/debian-12/docker-compose.yml @@ -1,4 +1,4 @@ -# Copyright VMware, Inc. +# Copyright Broadcom, Inc. All Rights Reserved. # SPDX-License-Identifier: APACHE-2.0 version: '2' diff --git a/bitnami/nginx/1.25/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/nginx/1.25/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json index 9e1625adf85f..ceab38370623 100644 --- a/bitnami/nginx/1.25/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/nginx/1.25/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json @@ -9,6 +9,6 @@ "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "1.0.6-11" + "version": "1.0.6-12" } } \ No newline at end of file diff --git a/bitnami/nginx/1.25/debian-12/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/nginx/1.25/debian-12/prebuildfs/opt/bitnami/scripts/libbitnami.sh index aa782fc6a4db..d239f9853573 100644 --- a/bitnami/nginx/1.25/debian-12/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/nginx/1.25/debian-12/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright VMware, Inc. +# Copyright Broadcom, Inc. All Rights Reserved. # SPDX-License-Identifier: APACHE-2.0 # # Bitnami custom library diff --git a/bitnami/nginx/1.25/debian-12/prebuildfs/opt/bitnami/scripts/libfile.sh b/bitnami/nginx/1.25/debian-12/prebuildfs/opt/bitnami/scripts/libfile.sh index 63759c777f3b..1c69e0e48a5d 100644 --- a/bitnami/nginx/1.25/debian-12/prebuildfs/opt/bitnami/scripts/libfile.sh +++ b/bitnami/nginx/1.25/debian-12/prebuildfs/opt/bitnami/scripts/libfile.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright VMware, Inc. +# Copyright Broadcom, Inc. All Rights Reserved. # SPDX-License-Identifier: APACHE-2.0 # # Library for managing files diff --git a/bitnami/nginx/1.25/debian-12/prebuildfs/opt/bitnami/scripts/libfs.sh b/bitnami/nginx/1.25/debian-12/prebuildfs/opt/bitnami/scripts/libfs.sh index 96b22f99710c..970d62417964 100644 --- a/bitnami/nginx/1.25/debian-12/prebuildfs/opt/bitnami/scripts/libfs.sh +++ b/bitnami/nginx/1.25/debian-12/prebuildfs/opt/bitnami/scripts/libfs.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright VMware, Inc. +# Copyright Broadcom, Inc. All Rights Reserved. # SPDX-License-Identifier: APACHE-2.0 # # Library for file system actions diff --git a/bitnami/nginx/1.25/debian-12/prebuildfs/opt/bitnami/scripts/libhook.sh b/bitnami/nginx/1.25/debian-12/prebuildfs/opt/bitnami/scripts/libhook.sh index dadd06149e00..f3a5fe7868ee 100644 --- a/bitnami/nginx/1.25/debian-12/prebuildfs/opt/bitnami/scripts/libhook.sh +++ b/bitnami/nginx/1.25/debian-12/prebuildfs/opt/bitnami/scripts/libhook.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright VMware, Inc. +# Copyright Broadcom, Inc. All Rights Reserved. # SPDX-License-Identifier: APACHE-2.0 # # Library to use for scripts expected to be used as Kubernetes lifecycle hooks diff --git a/bitnami/nginx/1.25/debian-12/prebuildfs/opt/bitnami/scripts/liblog.sh b/bitnami/nginx/1.25/debian-12/prebuildfs/opt/bitnami/scripts/liblog.sh index 2a9e76a4d725..450f05bd823f 100644 --- a/bitnami/nginx/1.25/debian-12/prebuildfs/opt/bitnami/scripts/liblog.sh +++ b/bitnami/nginx/1.25/debian-12/prebuildfs/opt/bitnami/scripts/liblog.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright VMware, Inc. +# Copyright Broadcom, Inc. All Rights Reserved. # SPDX-License-Identifier: APACHE-2.0 # # Library for logging functions diff --git a/bitnami/nginx/1.25/debian-12/prebuildfs/opt/bitnami/scripts/libnet.sh b/bitnami/nginx/1.25/debian-12/prebuildfs/opt/bitnami/scripts/libnet.sh index b47c69a56825..90652245c2a7 100644 --- a/bitnami/nginx/1.25/debian-12/prebuildfs/opt/bitnami/scripts/libnet.sh +++ b/bitnami/nginx/1.25/debian-12/prebuildfs/opt/bitnami/scripts/libnet.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright VMware, Inc. +# Copyright Broadcom, Inc. All Rights Reserved. # SPDX-License-Identifier: APACHE-2.0 # # Library for network functions diff --git a/bitnami/nginx/1.25/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/nginx/1.25/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh index c0500acee78d..9d908c48579b 100644 --- a/bitnami/nginx/1.25/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/nginx/1.25/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright VMware, Inc. +# Copyright Broadcom, Inc. All Rights Reserved. # SPDX-License-Identifier: APACHE-2.0 # # Library for operating system actions diff --git a/bitnami/nginx/1.25/debian-12/prebuildfs/opt/bitnami/scripts/libpersistence.sh b/bitnami/nginx/1.25/debian-12/prebuildfs/opt/bitnami/scripts/libpersistence.sh index af6af64d6dd0..18445e7d27fa 100644 --- a/bitnami/nginx/1.25/debian-12/prebuildfs/opt/bitnami/scripts/libpersistence.sh +++ b/bitnami/nginx/1.25/debian-12/prebuildfs/opt/bitnami/scripts/libpersistence.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright VMware, Inc. +# Copyright Broadcom, Inc. All Rights Reserved. # SPDX-License-Identifier: APACHE-2.0 # # Bitnami persistence library diff --git a/bitnami/nginx/1.25/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/nginx/1.25/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh index 107f54e6b5c9..1f9b33096b02 100644 --- a/bitnami/nginx/1.25/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh +++ b/bitnami/nginx/1.25/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright VMware, Inc. +# Copyright Broadcom, Inc. All Rights Reserved. # SPDX-License-Identifier: APACHE-2.0 # # Library for managing services @@ -132,7 +132,7 @@ generate_cron_conf() { mkdir -p /etc/cron.d if "$clean"; then cat > "/etc/cron.d/${service_name}" < "${monit_conf_dir}/${service_name}.conf${conf_suffix:-}" < "${logrotate_conf_dir}/${service_name}" -# Copyright VMware, Inc. +# Copyright Broadcom, Inc. All Rights Reserved. # SPDX-License-Identifier: APACHE-2.0 ${log_path} { @@ -402,7 +402,7 @@ generate_systemd_conf() { fi # Generate the Systemd unit cat > "$service_file" <