From f9c13644c70d23059d231a7d6fbb8229f3ed3676 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Tue, 19 Sep 2023 18:07:03 +0200
Subject: [PATCH] [bitnami/harbor-portal] Release 2.9.0-debian-11-r21 (#49166)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 bitnami/harbor-portal/2/debian-11/Dockerfile  |   4 +-
 .../2/debian-11/docker-compose.yml            |   1 -
 .../rootfs/opt/bitnami/scripts/libharbor.sh   | 120 ------------------
 bitnami/harbor-portal/docker-compose.yml      |   1 -
 4 files changed, 2 insertions(+), 124 deletions(-)

diff --git a/bitnami/harbor-portal/2/debian-11/Dockerfile b/bitnami/harbor-portal/2/debian-11/Dockerfile
index c45b16edb27c..d5bdd557f04c 100644
--- a/bitnami/harbor-portal/2/debian-11/Dockerfile
+++ b/bitnami/harbor-portal/2/debian-11/Dockerfile
@@ -7,10 +7,10 @@ ARG TARGETARCH
 
 LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \
       org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
-      org.opencontainers.image.created="2023-09-16T10:39:04Z" \
+      org.opencontainers.image.created="2023-09-19T15:13:21Z" \
       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-11-r17" \
+      org.opencontainers.image.ref.name="2.9.0-debian-11-r21" \
       org.opencontainers.image.title="harbor-portal" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="2.9.0"
diff --git a/bitnami/harbor-portal/2/debian-11/docker-compose.yml b/bitnami/harbor-portal/2/debian-11/docker-compose.yml
index e3ace484031e..917a4a76c30b 100644
--- a/bitnami/harbor-portal/2/debian-11/docker-compose.yml
+++ b/bitnami/harbor-portal/2/debian-11/docker-compose.yml
@@ -57,7 +57,6 @@ services:
       - CORE_SECRET=CHANGEME
       - JOBSERVICE_SECRET=CHANGEME
       - ADMIRAL_URL=
-      - WITH_NOTARY=False
       - CORE_URL=http://core:8080
       - JOBSERVICE_URL=http://jobservice:8080
       - REGISTRY_STORAGE_PROVIDER_NAME=filesystem
diff --git a/bitnami/harbor-portal/2/debian-11/rootfs/opt/bitnami/scripts/libharbor.sh b/bitnami/harbor-portal/2/debian-11/rootfs/opt/bitnami/scripts/libharbor.sh
index 93ed16af24aa..d6134ff84dd5 100644
--- a/bitnami/harbor-portal/2/debian-11/rootfs/opt/bitnami/scripts/libharbor.sh
+++ b/bitnami/harbor-portal/2/debian-11/rootfs/opt/bitnami/scripts/libharbor.sh
@@ -306,126 +306,6 @@ harbor_jobservice_stop() {
     stop_service_using_pid "$HARBOR_JOBSERVICE_PID_FILE"
 }
 
-########################
-# Print harbor-notary-server runtime environment
-# Arguments:
-#   None
-# Returns:
-#   Boolean
-#########################
-harbor_notary_server_print_env() {
-    if [[ -n "${HARBOR_NOTARY_SERVER_DATABASE_NAME:-}" ]]; then
-        # shellcheck disable=SC2034
-        HARBOR_NOTARY_SERVER_CFG_DB_URL="postgres://${HARBOR_NOTARY_SERVER_DATABASE_USERNAME:-}:${HARBOR_NOTARY_SERVER_DATABASE_PASSWORD:-}@${HARBOR_NOTARY_SERVER_DATABASE_HOST:-127.0.0.1}:${HARBOR_NOTARY_SERVER_DATABASE_PORT_NUMBER:-5432}/${HARBOR_NOTARY_SERVER_DATABASE_NAME}?sslmode=${HARBOR_NOTARY_SERVER_DATABASE_SSLMODE:-disable}"
-    fi
-    for var in "${!HARBOR_NOTARY_SERVER_CFG_@}"; do
-        echo "${var/HARBOR_NOTARY_SERVER_CFG_/}=${!var}"
-    done
-}
-
-########################
-# Check if harbor-notary-server is running
-# Arguments:
-#   None
-# Returns:
-#   Boolean
-#########################
-is_harbor_notary_server_running() {
-    # harbor-notary-server does not create any PID file
-    # We regenerate the PID file for each time we query it to avoid getting outdated
-    pgrep -f "$(command -v notary-server)" > "$HARBOR_NOTARY_SERVER_PID_FILE"
-
-    pid="$(get_pid_from_file "$HARBOR_NOTARY_SERVER_PID_FILE")"
-    if [[ -n "$pid" ]]; then
-        is_service_running "$pid"
-    else
-        false
-    fi
-}
-
-########################
-# Check if harbor-notary-server is not running
-# Arguments:
-#   None
-# Returns:
-#   Boolean
-#########################
-is_harbor_notary_server_not_running() {
-    ! is_harbor_notary_server_running
-}
-
-########################
-# Stop harbor-notary-server
-# Arguments:
-#   None
-# Returns:
-#   None
-#########################
-harbor_notary_server_stop() {
-    ! is_harbor_notary_server_running && return
-    stop_service_using_pid "$HARBOR_NOTARY_SERVER_PID_FILE"
-}
-
-########################
-# Print harbor-notary-signer runtime environment
-# Arguments:
-#   None
-# Returns:
-#   Boolean
-#########################
-harbor_notary_signer_print_env() {
-    if [[ -n "${HARBOR_NOTARY_SIGNER_DATABASE_NAME:-}" ]]; then
-        # shellcheck disable=SC2034
-        HARBOR_NOTARY_SIGNER_CFG_DB_URL="postgres://${HARBOR_NOTARY_SIGNER_DATABASE_USERNAME:-}:${HARBOR_NOTARY_SIGNER_DATABASE_PASSWORD:-}@${HARBOR_NOTARY_SIGNER_DATABASE_HOST:-127.0.0.1}:${HARBOR_NOTARY_SIGNER_DATABASE_PORT_NUMBER:-5432}/${HARBOR_NOTARY_SIGNER_DATABASE_NAME}?sslmode=${HARBOR_NOTARY_SIGNER_DATABASE_SSLMODE:-disable}"
-    fi
-    for var in "${!HARBOR_NOTARY_SIGNER_CFG_@}"; do
-        echo "${var/HARBOR_NOTARY_SIGNER_CFG_/}=${!var}"
-    done
-}
-
-########################
-# Check if harbor-notary-signer is running
-# Arguments:
-#   None
-# Returns:
-#   Boolean
-#########################
-is_harbor_notary_signer_running() {
-    # harbor-notary-signer does not create any PID file
-    # We regenerate the PID file for each time we query it to avoid getting outdated
-    pgrep -f "$(command -v notary-signer)" > "$HARBOR_NOTARY_SIGNER_PID_FILE"
-
-    pid="$(get_pid_from_file "$HARBOR_NOTARY_SIGNER_PID_FILE")"
-    if [[ -n "$pid" ]]; then
-        is_service_running "$pid"
-    else
-        false
-    fi
-}
-
-########################
-# Check if harbor-notary-signer is not running
-# Arguments:
-#   None
-# Returns:
-#   Boolean
-#########################
-is_harbor_notary_signer_not_running() {
-    ! is_harbor_notary_signer_running
-}
-
-########################
-# Stop harbor-notary-signer
-# Arguments:
-#   None
-# Returns:
-#   None
-#########################
-harbor_notary_signer_stop() {
-    ! is_harbor_notary_signer_running && return
-    stop_service_using_pid "$HARBOR_NOTARY_SIGNER_PID_FILE"
-}
-
 ########################
 # Print harbor-registry runtime environment
 # Arguments:
diff --git a/bitnami/harbor-portal/docker-compose.yml b/bitnami/harbor-portal/docker-compose.yml
index e3ace484031e..917a4a76c30b 100644
--- a/bitnami/harbor-portal/docker-compose.yml
+++ b/bitnami/harbor-portal/docker-compose.yml
@@ -57,7 +57,6 @@ services:
       - CORE_SECRET=CHANGEME
       - JOBSERVICE_SECRET=CHANGEME
       - ADMIRAL_URL=
-      - WITH_NOTARY=False
       - CORE_URL=http://core:8080
       - JOBSERVICE_URL=http://jobservice:8080
       - REGISTRY_STORAGE_PROVIDER_NAME=filesystem