From 68e3f186919a5cab346b0fe2b6266da3e06a1165 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami.bot@broadcom.com>
Date: Tue, 19 Aug 2025 09:24:17 +0200
Subject: [PATCH] [bitnami/harbor-portal] Release 2.13.2-debian-12-r2 (#85475)

Signed-off-by: Bitnami Bot <bitnami.bot@broadcom.com>
---
 bitnami/harbor-portal/2/debian-12/Dockerfile  |  7 +-
 .../opt/bitnami/.bitnami_components.json      |  4 +-
 .../opt/bitnami/scripts/libservice.sh         | 74 -----------------
 .../opt/bitnami/scripts/libwebserver.sh       | 80 -------------------
 .../rootfs/opt/bitnami/scripts/libharbor.sh   |  4 -
 .../opt/bitnami/scripts/nginx/reload.sh       | 20 -----
 .../opt/bitnami/scripts/nginx/restart.sh      | 19 -----
 .../rootfs/opt/bitnami/scripts/nginx/start.sh | 34 --------
 .../opt/bitnami/scripts/nginx/status.sh       | 23 ------
 .../rootfs/opt/bitnami/scripts/nginx/stop.sh  | 34 --------
 10 files changed, 6 insertions(+), 293 deletions(-)
 delete mode 100755 bitnami/harbor-portal/2/debian-12/rootfs/opt/bitnami/scripts/nginx/reload.sh
 delete mode 100755 bitnami/harbor-portal/2/debian-12/rootfs/opt/bitnami/scripts/nginx/restart.sh
 delete mode 100755 bitnami/harbor-portal/2/debian-12/rootfs/opt/bitnami/scripts/nginx/start.sh
 delete mode 100755 bitnami/harbor-portal/2/debian-12/rootfs/opt/bitnami/scripts/nginx/status.sh
 delete mode 100755 bitnami/harbor-portal/2/debian-12/rootfs/opt/bitnami/scripts/nginx/stop.sh

diff --git a/bitnami/harbor-portal/2/debian-12/Dockerfile b/bitnami/harbor-portal/2/debian-12/Dockerfile
index 56936753e2f0..8f7d29c9348e 100644
--- a/bitnami/harbor-portal/2/debian-12/Dockerfile
+++ b/bitnami/harbor-portal/2/debian-12/Dockerfile
@@ -8,7 +8,7 @@ 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-08-07T12:08:56Z" \
+      org.opencontainers.image.created="2025-08-19T07:15:05Z" \
       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" \
@@ -29,8 +29,8 @@ RUN --mount=type=secret,id=downloads_url,env=SECRET_DOWNLOADS_URL \
     DOWNLOADS_URL=${SECRET_DOWNLOADS_URL:-${DOWNLOADS_URL}} ; \
     mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \
     COMPONENTS=( \
-      "render-template-1.0.8-2-linux-${OS_ARCH}-debian-12" \
-      "nginx-1.29.0-0-linux-${OS_ARCH}-debian-12" \
+      "render-template-1.0.9-155-linux-${OS_ARCH}-debian-12" \
+      "nginx-1.29.1-0-linux-${OS_ARCH}-debian-12" \
       "harbor-2.13.2-0-linux-${OS_ARCH}-debian-12" \
     ) ; \
     for COMPONENT in "${COMPONENTS[@]}"; do \
@@ -55,6 +55,7 @@ RUN /opt/bitnami/scripts/nginx/postunpack.sh
 RUN /opt/bitnami/scripts/harbor-portal/postunpack.sh
 ENV APP_VERSION="2.13.2" \
     BITNAMI_APP_NAME="harbor-portal" \
+    IMAGE_REVISION="2" \
     NGINX_HTTPS_PORT_NUMBER="" \
     NGINX_HTTP_PORT_NUMBER="" \
     PATH="/opt/bitnami/common/bin:/opt/bitnami/nginx/sbin:$PATH"
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 abb8f3c40c0b..0891e8952454 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
@@ -9,12 +9,12 @@
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "1.29.0-0"
+        "version": "1.29.1-0"
     },
     "render-template": {
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "1.0.8-2"
+        "version": "1.0.9-155"
     }
 }
\ No newline at end of file
diff --git a/bitnami/harbor-portal/2/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/harbor-portal/2/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh
index 1f9b33096b02..886962ebd276 100644
--- a/bitnami/harbor-portal/2/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh
+++ b/bitnami/harbor-portal/2/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh
@@ -142,80 +142,6 @@ EOF
     fi
 }
 
-########################
-# Remove a cron configuration file for a given service
-# Arguments:
-#   $1 - Service name
-# Returns:
-#   None
-#########################
-remove_cron_conf() {
-    local service_name="${1:?service name is missing}"
-    local cron_conf_dir="/etc/monit/conf.d"
-    rm -f "${cron_conf_dir}/${service_name}"
-}
-
-########################
-# Generate a monit configuration file for a given service
-# Arguments:
-#   $1 - Service name
-#   $2 - Pid file
-#   $3 - Start command
-#   $4 - Stop command
-# Flags:
-#   --disable - Whether to disable the monit configuration
-# Returns:
-#   None
-#########################
-generate_monit_conf() {
-    local service_name="${1:?service name is missing}"
-    local pid_file="${2:?pid file is missing}"
-    local start_command="${3:?start command is missing}"
-    local stop_command="${4:?stop command is missing}"
-    local monit_conf_dir="/etc/monit/conf.d"
-    local disabled="no"
-
-    # Parse optional CLI flags
-    shift 4
-    while [[ "$#" -gt 0 ]]; do
-        case "$1" in
-            --disable)
-                disabled="yes"
-                ;;
-            *)
-                echo "Invalid command line flag ${1}" >&2
-                return 1
-                ;;
-        esac
-        shift
-    done
-
-    is_boolean_yes "$disabled" && conf_suffix=".disabled"
-    mkdir -p "$monit_conf_dir"
-    cat > "${monit_conf_dir}/${service_name}.conf${conf_suffix:-}" <<EOF
-# Copyright Broadcom, Inc. All Rights Reserved.
-# SPDX-License-Identifier: APACHE-2.0
-
-check process ${service_name}
-  with pidfile "${pid_file}"
-  start program = "${start_command}" with timeout 90 seconds
-  stop program = "${stop_command}" with timeout 90 seconds
-EOF
-}
-
-########################
-# Remove a monit configuration file for a given service
-# Arguments:
-#   $1 - Service name
-# Returns:
-#   None
-#########################
-remove_monit_conf() {
-    local service_name="${1:?service name is missing}"
-    local monit_conf_dir="/etc/monit/conf.d"
-    rm -f "${monit_conf_dir}/${service_name}.conf"
-}
-
 ########################
 # Generate a logrotate configuration file
 # Arguments:
diff --git a/bitnami/harbor-portal/2/debian-12/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/harbor-portal/2/debian-12/prebuildfs/opt/bitnami/scripts/libwebserver.sh
index acb84fc2339b..bbf4709b729f 100644
--- a/bitnami/harbor-portal/2/debian-12/prebuildfs/opt/bitnami/scripts/libwebserver.sh
+++ b/bitnami/harbor-portal/2/debian-12/prebuildfs/opt/bitnami/scripts/libwebserver.sh
@@ -139,41 +139,6 @@ web_server_stop() {
     fi
 }
 
-########################
-# Restart web server
-# Globals:
-#   *
-# Arguments:
-#   None
-# Returns:
-#   None
-#########################
-web_server_restart() {
-    info "Restarting $(web_server_type)"
-    if [[ "${BITNAMI_SERVICE_MANAGER:-}" = "systemd" ]]; then
-        systemctl restart "bitnami.$(web_server_type).service"
-    else
-        "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/restart.sh"
-    fi
-}
-
-########################
-# Reload web server
-# Globals:
-#   *
-# Arguments:
-#   None
-# Returns:
-#   None
-#########################
-web_server_reload() {
-    if [[ "${BITNAMI_SERVICE_MANAGER:-}" = "systemd" ]]; then
-        systemctl reload "bitnami.$(web_server_type).service"
-    else
-        "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/reload.sh"
-    fi
-}
-
 ########################
 # Ensure a web server application configuration exists (i.e. Apache virtual host format or NGINX server block)
 # It serves as a wrapper for the specific web server function
@@ -429,48 +394,3 @@ web_server_update_app_configuration() {
         web_server_execute "$web_server" "${web_server}_update_app_configuration" "${args[@]}"
     done
 }
-
-########################
-# Enable loading page, which shows users that the initialization process is not yet completed
-# Globals:
-#   *
-# Arguments:
-#   None
-# Returns:
-#   None
-#########################
-web_server_enable_loading_page() {
-    ensure_web_server_app_configuration_exists "__loading" --hosts "_default_" \
-        --apache-additional-configuration "
-# Show a HTTP 503 Service Unavailable page by default
-RedirectMatch 503 ^/$
-# Show index.html if server is answering with 404 Not Found or 503 Service Unavailable status codes
-ErrorDocument 404 /index.html
-ErrorDocument 503 /index.html" \
-        --nginx-additional-configuration "
-# Show a HTTP 503 Service Unavailable page by default
-location / {
-  return 503;
-}
-# Show index.html if server is answering with 404 Not Found or 503 Service Unavailable status codes
-error_page 404 @installing;
-error_page 503 @installing;
-location @installing {
-  rewrite ^(.*)$ /index.html break;
-}"
-    web_server_reload
-}
-
-########################
-# Enable loading page, which shows users that the initialization process is not yet completed
-# Globals:
-#   *
-# Arguments:
-#   None
-# Returns:
-#   None
-#########################
-web_server_disable_install_page() {
-    ensure_web_server_app_configuration_not_exists "__loading"
-    web_server_reload
-}
diff --git a/bitnami/harbor-portal/2/debian-12/rootfs/opt/bitnami/scripts/libharbor.sh b/bitnami/harbor-portal/2/debian-12/rootfs/opt/bitnami/scripts/libharbor.sh
index 519af74c581e..a9450b30276f 100644
--- a/bitnami/harbor-portal/2/debian-12/rootfs/opt/bitnami/scripts/libharbor.sh
+++ b/bitnami/harbor-portal/2/debian-12/rootfs/opt/bitnami/scripts/libharbor.sh
@@ -176,16 +176,12 @@ install_custom_certs() {
 harbor_generate_env_file_contents() {
     local -r envvars_string="${1:-}"
     [[ -z "$envvars_string" ]] && return
-    # For systemd, we will load it via EnvironmentFile=, so the shebang is not needed
-    [[ "$BITNAMI_SERVICE_MANAGER" != "systemd" ]] && echo "#!/bin/bash"
     while IFS= read -r ENV_VAR_LINE; do
         if [[ ! "$ENV_VAR_LINE" =~ ^[A-Z_] ]]; then
             continue
         fi
         ENV_VAR_NAME="${ENV_VAR_LINE/=*}"
         ENV_VAR_VALUE="${ENV_VAR_LINE#*=}"
-        # For systemd, we will load it via EnvironmentFile=, which does not allow 'export'
-        [[ "$BITNAMI_SERVICE_MANAGER" != "systemd" ]] && echo -n 'export '
         # Use single quotes to avoid shell expansion, and escape to be parsed properly (even if it contains quotes)
         # Escape the value, so it can be parsed as a variable even with quotes set
         echo "${ENV_VAR_NAME}='${ENV_VAR_VALUE//\'/\'\\\'\'}'"
diff --git a/bitnami/harbor-portal/2/debian-12/rootfs/opt/bitnami/scripts/nginx/reload.sh b/bitnami/harbor-portal/2/debian-12/rootfs/opt/bitnami/scripts/nginx/reload.sh
deleted file mode 100755
index ee331ca8a75d..000000000000
--- a/bitnami/harbor-portal/2/debian-12/rootfs/opt/bitnami/scripts/nginx/reload.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-# Copyright Broadcom, Inc. All Rights Reserved.
-# SPDX-License-Identifier: APACHE-2.0
-
-# shellcheck disable=SC1091
-
-set -o errexit
-set -o nounset
-set -o pipefail
-# set -o xtrace # Uncomment this line for debugging purposes
-
-# Load libraries
-. /opt/bitnami/scripts/libnginx.sh
-. /opt/bitnami/scripts/liblog.sh
-
-# Load NGINX environment
-. /opt/bitnami/scripts/nginx-env.sh
-
-info "** Reloading NGINX configuration **"
-exec "${NGINX_SBIN_DIR}/nginx" -s reload
diff --git a/bitnami/harbor-portal/2/debian-12/rootfs/opt/bitnami/scripts/nginx/restart.sh b/bitnami/harbor-portal/2/debian-12/rootfs/opt/bitnami/scripts/nginx/restart.sh
deleted file mode 100755
index c6be28670d2a..000000000000
--- a/bitnami/harbor-portal/2/debian-12/rootfs/opt/bitnami/scripts/nginx/restart.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-# Copyright Broadcom, Inc. All Rights Reserved.
-# SPDX-License-Identifier: APACHE-2.0
-
-# shellcheck disable=SC1091
-
-set -o errexit
-set -o nounset
-set -o pipefail
-# set -o xtrace # Uncomment this line for debugging purposes
-
-# Load libraries
-. /opt/bitnami/scripts/libnginx.sh
-
-# Load NGINX environment variables
-. /opt/bitnami/scripts/nginx-env.sh
-
-/opt/bitnami/scripts/nginx/stop.sh
-/opt/bitnami/scripts/nginx/start.sh
diff --git a/bitnami/harbor-portal/2/debian-12/rootfs/opt/bitnami/scripts/nginx/start.sh b/bitnami/harbor-portal/2/debian-12/rootfs/opt/bitnami/scripts/nginx/start.sh
deleted file mode 100755
index f84286cf313b..000000000000
--- a/bitnami/harbor-portal/2/debian-12/rootfs/opt/bitnami/scripts/nginx/start.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-# Copyright Broadcom, Inc. All Rights Reserved.
-# SPDX-License-Identifier: APACHE-2.0
-
-# shellcheck disable=SC1091
-
-set -o errexit
-set -o nounset
-set -o pipefail
-# set -o xtrace # Uncomment this line for debugging purposes
-
-# Load libraries
-. /opt/bitnami/scripts/libnginx.sh
-. /opt/bitnami/scripts/libos.sh
-. /opt/bitnami/scripts/liblog.sh
-
-# Load NGINX environment variables
-. /opt/bitnami/scripts/nginx-env.sh
-
-error_code=0
-
-if is_nginx_not_running; then
-    "${NGINX_SBIN_DIR}/nginx" -c "$NGINX_CONF_FILE"
-    if ! retry_while "is_nginx_running"; then
-        error "nginx did not start"
-        error_code=1
-    else
-        info "nginx started"
-    fi
-else
-    info "nginx is already running"
-fi
-
-exit "$error_code"
diff --git a/bitnami/harbor-portal/2/debian-12/rootfs/opt/bitnami/scripts/nginx/status.sh b/bitnami/harbor-portal/2/debian-12/rootfs/opt/bitnami/scripts/nginx/status.sh
deleted file mode 100755
index ae92fcec68f4..000000000000
--- a/bitnami/harbor-portal/2/debian-12/rootfs/opt/bitnami/scripts/nginx/status.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-# Copyright Broadcom, Inc. All Rights Reserved.
-# SPDX-License-Identifier: APACHE-2.0
-
-# shellcheck disable=SC1091
-
-set -o errexit
-set -o nounset
-set -o pipefail
-# set -o xtrace # Uncomment this line for debugging purposes
-
-# Load libraries
-. /opt/bitnami/scripts/libnginx.sh
-. /opt/bitnami/scripts/liblog.sh
-
-# Load NGINX environment variables
-. /opt/bitnami/scripts/nginx-env.sh
-
-if is_nginx_running; then
-    info "nginx is already running"
-else
-    info "nginx is not running"
-fi
diff --git a/bitnami/harbor-portal/2/debian-12/rootfs/opt/bitnami/scripts/nginx/stop.sh b/bitnami/harbor-portal/2/debian-12/rootfs/opt/bitnami/scripts/nginx/stop.sh
deleted file mode 100755
index 484d0e071525..000000000000
--- a/bitnami/harbor-portal/2/debian-12/rootfs/opt/bitnami/scripts/nginx/stop.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-# Copyright Broadcom, Inc. All Rights Reserved.
-# SPDX-License-Identifier: APACHE-2.0
-
-# shellcheck disable=SC1091
-
-set -o errexit
-set -o nounset
-set -o pipefail
-# set -o xtrace # Uncomment this line for debugging purposes
-
-# Load libraries
-. /opt/bitnami/scripts/libnginx.sh
-. /opt/bitnami/scripts/libos.sh
-. /opt/bitnami/scripts/liblog.sh
-
-# Load NGINX environment variables
-. /opt/bitnami/scripts/nginx-env.sh
-
-error_code=0
-
-if is_nginx_running; then
-    BITNAMI_QUIET=1 nginx_stop
-    if ! retry_while "is_nginx_not_running"; then
-        error "nginx could not be stopped"
-        error_code=1
-    else
-        info "nginx stopped"
-    fi
-else
-    info "nginx is not running"
-fi
-
-exit "$error_code"