diff --git a/bitnami/hubble-ui/0/debian-12/Dockerfile b/bitnami/hubble-ui/0/debian-12/Dockerfile index f9003f9818695..4178ecb32289c 100644 --- a/bitnami/hubble-ui/0/debian-12/Dockerfile +++ b/bitnami/hubble-ui/0/debian-12/Dockerfile @@ -3,15 +3,16 @@ FROM docker.io/bitnami/minideb:bookworm +ARG DOWNLOADS_URL="downloads.bitnami.com/files/stacksmith" 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-10-14T15:10:30Z" \ + org.opencontainers.image.created="2024-10-24T20:22:46Z" \ org.opencontainers.image.description="Application packaged by Broadcom, Inc." \ org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/hubble-ui/README.md" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="0.13.1-debian-12-r8" \ + org.opencontainers.image.ref.name="0.13.1-debian-12-r9" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/hubble-ui" \ org.opencontainers.image.title="hubble-ui" \ org.opencontainers.image.vendor="Broadcom, Inc." \ @@ -28,14 +29,14 @@ 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.7-5-linux-${OS_ARCH}-debian-12" \ - "nginx-1.27.2-0-linux-${OS_ARCH}-debian-12" \ - "hubble-ui-0.13.1-1-linux-${OS_ARCH}-debian-12" \ + "render-template-1.0.7-6-linux-${OS_ARCH}-debian-12" \ + "nginx-1.27.2-1-linux-${OS_ARCH}-debian-12" \ + "hubble-ui-0.13.1-2-linux-${OS_ARCH}-debian-12" \ ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ - curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ - curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ + curl -SsLf "https://${DOWNLOADS_URL}/${COMPONENT}.tar.gz" -O ; \ + 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' ; \ diff --git a/bitnami/hubble-ui/0/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/hubble-ui/0/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json index 4ebc8aa0e5cf4..b5c291e0a3972 100644 --- a/bitnami/hubble-ui/0/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/hubble-ui/0/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,18 +3,18 @@ "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "0.13.1-1" + "version": "0.13.1-2" }, "nginx": { "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "1.27.2-0" + "version": "1.27.2-1" }, "render-template": { "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "1.0.7-5" + "version": "1.0.7-6" } } \ No newline at end of file diff --git a/bitnami/hubble-ui/0/debian-12/rootfs/opt/bitnami/scripts/libnginx.sh b/bitnami/hubble-ui/0/debian-12/rootfs/opt/bitnami/scripts/libnginx.sh index 30902934f1224..e7f0bfe83a0e1 100644 --- a/bitnami/hubble-ui/0/debian-12/rootfs/opt/bitnami/scripts/libnginx.sh +++ b/bitnami/hubble-ui/0/debian-12/rootfs/opt/bitnami/scripts/libnginx.sh @@ -209,7 +209,9 @@ nginx_initialize() { nginx_configure "absolute_redirect" "$(is_boolean_yes "$NGINX_ENABLE_ABSOLUTE_REDIRECT" && echo "on" || echo "off" )" nginx_configure "port_in_redirect" "$(is_boolean_yes "$NGINX_ENABLE_PORT_IN_REDIRECT" && echo "on" || echo "off" )" # Stream configuration - if is_boolean_yes "$NGINX_ENABLE_STREAM" && is_file_writable "$NGINX_CONF_FILE"; then + if is_boolean_yes "$NGINX_ENABLE_STREAM" && + is_file_writable "$NGINX_CONF_FILE" && + ! grep -q "include \"$NGINX_STREAM_SERVER_BLOCKS_DIR" "$NGINX_CONF_FILE"; then cat >> "$NGINX_CONF_FILE" <