diff --git a/bitnami/nginx/1.27/debian-12/Dockerfile b/bitnami/nginx/1.27/debian-12/Dockerfile index d741d6a679e9..e3d14d29bd54 100644 --- a/bitnami/nginx/1.27/debian-12/Dockerfile +++ b/bitnami/nginx/1.27/debian-12/Dockerfile @@ -8,10 +8,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \ - org.opencontainers.image.created="2025-03-15T20:26:27Z" \ + org.opencontainers.image.created="2025-04-05T19:53:21Z" \ 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.ref.name="1.27.4-debian-12-r7" \ + org.opencontainers.image.ref.name="1.27.4-debian-12-r8" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/nginx" \ org.opencontainers.image.title="nginx" \ org.opencontainers.image.vendor="Broadcom, Inc." \ @@ -26,9 +26,9 @@ COPY prebuildfs / SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies 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/ ; \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \ COMPONENTS=( \ - "render-template-1.0.7-14-linux-${OS_ARCH}-debian-12" \ + "render-template-1.0.7-15-linux-${OS_ARCH}-debian-12" \ "nginx-1.27.4-5-linux-${OS_ARCH}-debian-12" \ ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ @@ -37,7 +37,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ curl -SsLf "https://${DOWNLOADS_URL}/${COMPONENT}.tar.gz.sha256" -O ; \ fi ; \ sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ diff --git a/bitnami/nginx/1.27/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/nginx/1.27/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json index 87af6337a34b..20a42f16e721 100644 --- a/bitnami/nginx/1.27/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/nginx/1.27/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json @@ -9,6 +9,6 @@ "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "1.0.7-14" + "version": "1.0.7-15" } } \ No newline at end of file diff --git a/bitnami/nginx/1.27/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh b/bitnami/nginx/1.27/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh index b4084bbe976b..6b392b1d1e5c 100644 --- a/bitnami/nginx/1.27/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh +++ b/bitnami/nginx/1.27/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh @@ -277,22 +277,12 @@ validate_string() { return 1 ;; *) - break + string="$1" ;; esac shift done - if [ "$#" -gt 1 ]; then - stderr_print "too many arguments provided" - return 2 - elif [ "$#" -eq 0 ]; then - stderr_print "missing string" - return 1 - else - string=$1 - fi - if [[ "$min_length" -ge 0 ]] && [[ "${#string}" -lt "$min_length" ]]; then echo "string length is less than $min_length" return 1 diff --git a/bitnami/nginx/1.27/debian-12/rootfs/opt/bitnami/scripts/nginx/bitnami-templates/app-php-prefix.conf.tpl b/bitnami/nginx/1.27/debian-12/rootfs/opt/bitnami/scripts/nginx/bitnami-templates/app-php-prefix.conf.tpl index 28bb0393aaa3..985f3565c3ed 100644 --- a/bitnami/nginx/1.27/debian-12/rootfs/opt/bitnami/scripts/nginx/bitnami-templates/app-php-prefix.conf.tpl +++ b/bitnami/nginx/1.27/debian-12/rootfs/opt/bitnami/scripts/nginx/bitnami-templates/app-php-prefix.conf.tpl @@ -3,7 +3,8 @@ location ^~ {{location}} { {{acl_configuration}} - include "/opt/bitnami/nginx/conf/bitnami/protect-hidden-files.conf"; + include "/opt/bitnami/nginx/conf/bitnami/00_protect-hidden-files.conf"; + include "/opt/bitnami/nginx/conf/bitnami/00_protect-uploads-dirs.conf"; include "/opt/bitnami/nginx/conf/bitnami/php-fpm.conf"; } diff --git a/bitnami/nginx/1.27/debian-12/rootfs/opt/bitnami/scripts/nginx/bitnami-templates/app-prefix.conf.tpl b/bitnami/nginx/1.27/debian-12/rootfs/opt/bitnami/scripts/nginx/bitnami-templates/app-prefix.conf.tpl index b7d04e1e80f7..6ba022726622 100644 --- a/bitnami/nginx/1.27/debian-12/rootfs/opt/bitnami/scripts/nginx/bitnami-templates/app-prefix.conf.tpl +++ b/bitnami/nginx/1.27/debian-12/rootfs/opt/bitnami/scripts/nginx/bitnami-templates/app-prefix.conf.tpl @@ -3,7 +3,8 @@ location ^~ {{location}} { {{acl_configuration}} - include "/opt/bitnami/nginx/conf/bitnami/protect-hidden-files.conf"; + include "/opt/bitnami/nginx/conf/bitnami/00_protect-hidden-files.conf"; + include "/opt/bitnami/nginx/conf/bitnami/00_protect-uploads-dirs.conf"; } {{additional_configuration}}