From 3012456c5ae80e03f5a2301aaf110c344b585ddd Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Wed, 20 Sep 2023 17:36:31 +0200 Subject: [PATCH] [bitnami/harbor-jobservice] Release 2.9.0-debian-11-r8 (#49291) Signed-off-by: Bitnami Containers --- .../harbor-jobservice/2/debian-11/Dockerfile | 4 +- .../rootfs/opt/bitnami/scripts/libharbor.sh | 120 ------------------ 2 files changed, 2 insertions(+), 122 deletions(-) diff --git a/bitnami/harbor-jobservice/2/debian-11/Dockerfile b/bitnami/harbor-jobservice/2/debian-11/Dockerfile index c88d0b500a83..82da9bf90ed0 100644 --- a/bitnami/harbor-jobservice/2/debian-11/Dockerfile +++ b/bitnami/harbor-jobservice/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-16T17:29:54Z" \ + org.opencontainers.image.created="2023-09-19T18:57:46Z" \ 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-r5" \ + org.opencontainers.image.ref.name="2.9.0-debian-11-r8" \ org.opencontainers.image.title="harbor-jobservice" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="2.9.0" diff --git a/bitnami/harbor-jobservice/2/debian-11/rootfs/opt/bitnami/scripts/libharbor.sh b/bitnami/harbor-jobservice/2/debian-11/rootfs/opt/bitnami/scripts/libharbor.sh index 93ed16af24aa..d6134ff84dd5 100644 --- a/bitnami/harbor-jobservice/2/debian-11/rootfs/opt/bitnami/scripts/libharbor.sh +++ b/bitnami/harbor-jobservice/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: