diff --git a/bitnami/harbor-portal/2/debian-12/Dockerfile b/bitnami/harbor-portal/2/debian-12/Dockerfile index 8d4aec14dfc1..cb48f88ab616 100644 --- a/bitnami/harbor-portal/2/debian-12/Dockerfile +++ b/bitnami/harbor-portal/2/debian-12/Dockerfile @@ -8,13 +8,13 @@ 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-07-30T13:40:15Z" \ + org.opencontainers.image.created="2025-07-31T10:49:59Z" \ org.opencontainers.image.description="Application packaged by Broadcom, Inc." \ org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/harbor-portal/README.md" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/harbor-portal" \ org.opencontainers.image.title="harbor-portal" \ org.opencontainers.image.vendor="Broadcom, Inc." \ - org.opencontainers.image.version="2.13.1" + org.opencontainers.image.version="2.13.2" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -31,7 +31,7 @@ RUN --mount=type=secret,id=downloads_url,env=SECRET_DOWNLOADS_URL \ COMPONENTS=( \ "render-template-1.0.8-1-linux-${OS_ARCH}-debian-12" \ "nginx-1.29.0-0-linux-${OS_ARCH}-debian-12" \ - "harbor-2.13.1-1-linux-${OS_ARCH}-debian-12" \ + "harbor-2.13.2-0-linux-${OS_ARCH}-debian-12" \ ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ @@ -53,7 +53,7 @@ RUN uninstall_packages curl COPY rootfs / RUN /opt/bitnami/scripts/nginx/postunpack.sh RUN /opt/bitnami/scripts/harbor-portal/postunpack.sh -ENV APP_VERSION="2.13.1" \ +ENV APP_VERSION="2.13.2" \ BITNAMI_APP_NAME="harbor-portal" \ NGINX_HTTPS_PORT_NUMBER="" \ NGINX_HTTP_PORT_NUMBER="" \ diff --git a/bitnami/harbor-portal/2/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/harbor-portal/2/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json index a34c1db50315..69fe9a057b1a 100644 --- a/bitnami/harbor-portal/2/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/harbor-portal/2/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,7 +3,7 @@ "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "2.13.1-1" + "version": "2.13.2-0" }, "nginx": { "arch": "amd64", diff --git a/bitnami/harbor-portal/2/debian-12/rootfs/opt/bitnami/nginx/conf/nginx.conf b/bitnami/harbor-portal/2/debian-12/rootfs/opt/bitnami/nginx/conf/nginx.conf index 9833b1cfd043..02675408fea8 100644 --- a/bitnami/harbor-portal/2/debian-12/rootfs/opt/bitnami/nginx/conf/nginx.conf +++ b/bitnami/harbor-portal/2/debian-12/rootfs/opt/bitnami/nginx/conf/nginx.conf @@ -5,8 +5,11 @@ worker_processes auto; error_log "/opt/bitnami/nginx/logs/error.log"; pid "/opt/bitnami/nginx/tmp/nginx.pid"; +include "/opt/bitnami/nginx/conf/context.d/main/*.conf"; + events { worker_connections 1024; + include "/opt/bitnami/nginx/conf/context.d/events/*.conf"; } http { @@ -42,6 +45,7 @@ http { port_in_redirect off; include "/opt/bitnami/nginx/conf/server_blocks/*.conf"; + include "/opt/bitnami/nginx/conf/context.d/http/*.conf"; # HTTP Server server { diff --git a/bitnami/harbor-portal/2/debian-12/rootfs/opt/bitnami/scripts/nginx/postunpack.sh b/bitnami/harbor-portal/2/debian-12/rootfs/opt/bitnami/scripts/nginx/postunpack.sh index 26b18da3c3b6..81ee60d06442 100755 --- a/bitnami/harbor-portal/2/debian-12/rootfs/opt/bitnami/scripts/nginx/postunpack.sh +++ b/bitnami/harbor-portal/2/debian-12/rootfs/opt/bitnami/scripts/nginx/postunpack.sh @@ -37,6 +37,13 @@ nginx_patch_httpoxy_vulnerability() { # Remove unnecessary directories that come with the tarball rm -rf "${BITNAMI_ROOT_DIR}/certs" "${BITNAMI_ROOT_DIR}/server_blocks" +# Context include directories +NGINX_CONTEXT_INCLUDES=( + "main" + "events" + "http" +) + # Ensure non-root user has write permissions on a set of directories chmod g+w "$NGINX_BASE_DIR" for dir in "$NGINX_VOLUME_DIR" "$NGINX_CONF_DIR" "$NGINX_INITSCRIPTS_DIR" "$NGINX_SERVER_BLOCKS_DIR" "$NGINX_STREAM_SERVER_BLOCKS_DIR" "${NGINX_CONF_DIR}/bitnami" "${NGINX_CONF_DIR}/bitnami/certs" "$NGINX_LOGS_DIR" "$NGINX_TMP_DIR" "$NGINX_DEFAULT_CONF_DIR"; do @@ -44,6 +51,14 @@ for dir in "$NGINX_VOLUME_DIR" "$NGINX_CONF_DIR" "$NGINX_INITSCRIPTS_DIR" "$NGIN chmod -R g+rwX "$dir" done +# Create context.d directory and context include directories +ensure_dir_exists "${NGINX_CONF_DIR}/context.d" +chmod -R g+rwX "${NGINX_CONF_DIR}/context.d" +for context in "${NGINX_CONTEXT_INCLUDES[@]}"; do + ensure_dir_exists "${NGINX_CONF_DIR}/context.d/${context}" + chmod -R g+rwX "${NGINX_CONF_DIR}/context.d/${context}" +done + # Unset HTTP_PROXY header to protect vs HTTPPOXY vulnerability nginx_patch_httpoxy_vulnerability