From 54ffff95e8ddda778dd1c5ab4fca418cea9ca45c Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Fri, 22 Mar 2024 14:24:28 +0100 Subject: [PATCH] [bitnami/kubeapps-dashboard] Release 2.9.0-debian-12-r19 (#64011) Signed-off-by: Bitnami Containers --- bitnami/kubeapps-dashboard/2/debian-12/Dockerfile | 6 +++--- .../prebuildfs/opt/bitnami/.bitnami_components.json | 2 +- .../debian-12/prebuildfs/opt/bitnami/scripts/libbitnami.sh | 1 + .../2/debian-12/rootfs/opt/bitnami/scripts/libnginx.sh | 5 +++++ .../2/debian-12/rootfs/opt/bitnami/scripts/nginx-env.sh | 1 + .../rootfs/opt/bitnami/scripts/nginx/entrypoint.sh | 7 +++++++ .../rootfs/opt/bitnami/scripts/nginx/postunpack.sh | 7 ++++++- 7 files changed, 24 insertions(+), 5 deletions(-) diff --git a/bitnami/kubeapps-dashboard/2/debian-12/Dockerfile b/bitnami/kubeapps-dashboard/2/debian-12/Dockerfile index f63c8c49cfa9..7b902bf48367 100644 --- a/bitnami/kubeapps-dashboard/2/debian-12/Dockerfile +++ b/bitnami/kubeapps-dashboard/2/debian-12/Dockerfile @@ -7,10 +7,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="2024-02-21T12:06:25Z" \ + org.opencontainers.image.created="2024-03-22T12:58:59Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.9.0-debian-12-r18" \ + org.opencontainers.image.ref.name="2.9.0-debian-12-r19" \ org.opencontainers.image.title="kubeapps-dashboard" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="2.9.0" @@ -25,7 +25,7 @@ SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] RUN install_packages ca-certificates curl 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-9-linux-${OS_ARCH}-debian-12" \ + "render-template-1.0.6-10-linux-${OS_ARCH}-debian-12" \ "nginx-1.25.4-0-linux-${OS_ARCH}-debian-12" \ "kubeapps-2.9.0-3-linux-${OS_ARCH}-debian-12" \ ) ; \ diff --git a/bitnami/kubeapps-dashboard/2/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/kubeapps-dashboard/2/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json index b485dad36f2b..89ca17cb55bf 100644 --- a/bitnami/kubeapps-dashboard/2/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/kubeapps-dashboard/2/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json @@ -15,6 +15,6 @@ "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "1.0.6-9" + "version": "1.0.6-10" } } \ No newline at end of file diff --git a/bitnami/kubeapps-dashboard/2/debian-12/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/kubeapps-dashboard/2/debian-12/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 3853c789b2ea..aa782fc6a4db 100644 --- a/bitnami/kubeapps-dashboard/2/debian-12/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/kubeapps-dashboard/2/debian-12/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -48,6 +48,7 @@ print_image_welcome_page() { info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "Upgrade to Tanzu Application Catalog for production environments to access custom-configured and pre-packaged software components. Gain enhanced features, including Software Bill of Materials (SBOM), CVE scan result reports, and VEX documents. To learn more, visit ${BOLD}https://bitnami.com/enterprise${RESET}" info "" } diff --git a/bitnami/kubeapps-dashboard/2/debian-12/rootfs/opt/bitnami/scripts/libnginx.sh b/bitnami/kubeapps-dashboard/2/debian-12/rootfs/opt/bitnami/scripts/libnginx.sh index 40f204ea4f7c..e72f5eddd15c 100644 --- a/bitnami/kubeapps-dashboard/2/debian-12/rootfs/opt/bitnami/scripts/libnginx.sh +++ b/bitnami/kubeapps-dashboard/2/debian-12/rootfs/opt/bitnami/scripts/libnginx.sh @@ -164,6 +164,11 @@ nginx_validate() { nginx_initialize() { info "Initializing NGINX" + # bypassing the setup.sh logic. If the file already exists do not overwrite (in + # case someone mounts a configuration file in /opt/bitnami/nginx/conf) + debug "Copying files from $NGINX_DEFAULT_CONF_DIR to $NGINX_CONF_DIR" + cp -nr "$NGINX_DEFAULT_CONF_DIR"/. "$NGINX_CONF_DIR" || true + # This fixes an issue where the trap would kill the entrypoint.sh, if a PID was left over from a previous run # Exec replaces the process without creating a new one, and when the container is restarted it may have the same PID rm -f "${NGINX_TMP_DIR}/nginx.pid" diff --git a/bitnami/kubeapps-dashboard/2/debian-12/rootfs/opt/bitnami/scripts/nginx-env.sh b/bitnami/kubeapps-dashboard/2/debian-12/rootfs/opt/bitnami/scripts/nginx-env.sh index 1d584e7b82c1..c0f79b87059c 100644 --- a/bitnami/kubeapps-dashboard/2/debian-12/rootfs/opt/bitnami/scripts/nginx-env.sh +++ b/bitnami/kubeapps-dashboard/2/debian-12/rootfs/opt/bitnami/scripts/nginx-env.sh @@ -49,6 +49,7 @@ export NGINX_BASE_DIR="${BITNAMI_ROOT_DIR}/nginx" export NGINX_VOLUME_DIR="${BITNAMI_VOLUME_DIR}/nginx" export NGINX_SBIN_DIR="${NGINX_BASE_DIR}/sbin" export NGINX_CONF_DIR="${NGINX_BASE_DIR}/conf" +export NGINX_DEFAULT_CONF_DIR="${NGINX_BASE_DIR}/conf.default" export NGINX_HTDOCS_DIR="${NGINX_BASE_DIR}/html" export NGINX_TMP_DIR="${NGINX_BASE_DIR}/tmp" export NGINX_LOGS_DIR="${NGINX_BASE_DIR}/logs" diff --git a/bitnami/kubeapps-dashboard/2/debian-12/rootfs/opt/bitnami/scripts/nginx/entrypoint.sh b/bitnami/kubeapps-dashboard/2/debian-12/rootfs/opt/bitnami/scripts/nginx/entrypoint.sh index cce4b3e874a3..a90b78b6e353 100755 --- a/bitnami/kubeapps-dashboard/2/debian-12/rootfs/opt/bitnami/scripts/nginx/entrypoint.sh +++ b/bitnami/kubeapps-dashboard/2/debian-12/rootfs/opt/bitnami/scripts/nginx/entrypoint.sh @@ -18,6 +18,13 @@ set -o pipefail print_welcome_page +# We add the copy from default config in the entrypoint to not break users +# bypassing the setup.sh logic. If the file already exists do not overwrite (in +# case someone mounts a configuration file in /opt/bitnami/nginx/conf) +debug "Copying files from $NGINX_DEFAULT_CONF_DIR to $NGINX_CONF_DIR" +cp -nr "$NGINX_DEFAULT_CONF_DIR"/. "$NGINX_CONF_DIR" || true + + if [[ "$1" = "/opt/bitnami/scripts/nginx/run.sh" ]]; then info "** Starting NGINX setup **" /opt/bitnami/scripts/nginx/setup.sh diff --git a/bitnami/kubeapps-dashboard/2/debian-12/rootfs/opt/bitnami/scripts/nginx/postunpack.sh b/bitnami/kubeapps-dashboard/2/debian-12/rootfs/opt/bitnami/scripts/nginx/postunpack.sh index 2ebe0fb36870..1663462b6286 100755 --- a/bitnami/kubeapps-dashboard/2/debian-12/rootfs/opt/bitnami/scripts/nginx/postunpack.sh +++ b/bitnami/kubeapps-dashboard/2/debian-12/rootfs/opt/bitnami/scripts/nginx/postunpack.sh @@ -38,7 +38,7 @@ nginx_patch_httpoxy_vulnerability() { rm -rf "${BITNAMI_ROOT_DIR}/certs" "${BITNAMI_ROOT_DIR}/server_blocks" # Ensure non-root user has write permissions on a set of directories -for dir in "$NGINX_VOLUME_DIR" "$NGINX_CONF_DIR" "$NGINX_INITSCRIPTS_DIR" "$NGINX_SERVER_BLOCKS_DIR" "${NGINX_CONF_DIR}/bitnami" "${NGINX_CONF_DIR}/bitnami/certs" "$NGINX_LOGS_DIR" "$NGINX_TMP_DIR"; do +for dir in "$NGINX_VOLUME_DIR" "$NGINX_CONF_DIR" "$NGINX_INITSCRIPTS_DIR" "$NGINX_SERVER_BLOCKS_DIR" "${NGINX_CONF_DIR}/bitnami" "${NGINX_CONF_DIR}/bitnami/certs" "$NGINX_LOGS_DIR" "$NGINX_TMP_DIR" "$NGINX_DEFAULT_CONF_DIR"; do ensure_dir_exists "$dir" chmod -R g+rwX "$dir" done @@ -72,3 +72,8 @@ ln -sf "/dev/stderr" "${NGINX_LOGS_DIR}/error.log" # Source: https://stackoverflow.com/questions/94445/using-openssl-what-does-unable-to-write-random-state-mean touch /.rnd && chmod g+rw /.rnd + +# Copy all initially generated configuration files to the default directory +# (this is to avoid breaking when entrypoint is being overridden) +cp -r "${NGINX_CONF_DIR}"/* "$NGINX_DEFAULT_CONF_DIR" +