From 9daa65cb1caac80779b3cd630352ba0527f13340 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 12 Jan 2023 09:28:37 +0100 Subject: [PATCH] [bitnami/harbor-portal] Release 2.7.0-debian-11-r8 (#19993) Signed-off-by: Bitnami Containers Signed-off-by: Bitnami Containers --- bitnami/harbor-portal/2/debian-11/Dockerfile | 3 ++- .../prebuildfs/opt/bitnami/scripts/libversion.sh | 2 +- .../rootfs/opt/bitnami/scripts/libharbor.sh | 2 ++ .../rootfs/opt/bitnami/scripts/libnginx.sh | 14 +++++++------- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/bitnami/harbor-portal/2/debian-11/Dockerfile b/bitnami/harbor-portal/2/debian-11/Dockerfile index b8a4a1725ee1..c12e4f1c4bf0 100644 --- a/bitnami/harbor-portal/2/debian-11/Dockerfile +++ b/bitnami/harbor-portal/2/debian-11/Dockerfile @@ -4,7 +4,8 @@ ARG TARGETARCH LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \ org.opencontainers.image.description="Application packaged by Bitnami" \ - org.opencontainers.image.ref.name="2.7.0-debian-11-r7" \ + org.opencontainers.image.licenses="Apache-2.0" \ + org.opencontainers.image.ref.name="2.7.0-debian-11-r8" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/harbor-portal" \ org.opencontainers.image.title="harbor-portal" \ org.opencontainers.image.vendor="VMware, Inc." \ diff --git a/bitnami/harbor-portal/2/debian-11/prebuildfs/opt/bitnami/scripts/libversion.sh b/bitnami/harbor-portal/2/debian-11/prebuildfs/opt/bitnami/scripts/libversion.sh index f3bc7568bfa5..ad2f0eee48df 100644 --- a/bitnami/harbor-portal/2/debian-11/prebuildfs/opt/bitnami/scripts/libversion.sh +++ b/bitnami/harbor-portal/2/debian-11/prebuildfs/opt/bitnami/scripts/libversion.sh @@ -31,7 +31,7 @@ get_sematic_version () { while [[ $i -lt $n ]]; do if [[ -n "${BASH_REMATCH[$i]}" ]] && [[ "${BASH_REMATCH[$i]:0:1}" != '.' ]]; then - version_sections[$j]=${BASH_REMATCH[$i]} + version_sections[j]="${BASH_REMATCH[$i]}" ((j++)) fi ((i++)) 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 c33761e3e2e4..12f60ee61754 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 @@ -264,6 +264,7 @@ harbor_jobservice_stop() { ######################### 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 @@ -323,6 +324,7 @@ harbor_notary_server_stop() { ######################### 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 diff --git a/bitnami/harbor-portal/2/debian-11/rootfs/opt/bitnami/scripts/libnginx.sh b/bitnami/harbor-portal/2/debian-11/rootfs/opt/bitnami/scripts/libnginx.sh index cb791af18624..bde1ebb2822f 100644 --- a/bitnami/harbor-portal/2/debian-11/rootfs/opt/bitnami/scripts/libnginx.sh +++ b/bitnami/harbor-portal/2/debian-11/rootfs/opt/bitnami/scripts/libnginx.sh @@ -252,14 +252,14 @@ ensure_nginx_app_configuration_exists() { --server-aliases) var_name="$(echo "$1" | sed -e "s/^--//" -e "s/-/_/g")" shift - read -r -a "$var_name" <<<"$1" + read -r -a "${var_name?}" <<<"$1" ;; --disable | \ --disable-http | \ --disable-https) var_name="$(echo "$1" | sed -e "s/^--//" -e "s/-/_/g")" - export "${var_name}=yes" + export "${var_name?}=yes" ;; --type | \ --server-name | \ @@ -273,7 +273,7 @@ ensure_nginx_app_configuration_exists() { var_name="$(echo "$1" | sed -e "s/^--//" -e "s/-/_/g")" shift - export "${var_name}"="$1" + export "${var_name?}"="$1" ;; *) echo "Invalid command line flag $1" >&2 @@ -419,7 +419,7 @@ ensure_nginx_prefix_configuration_exists() { var_name="$(echo "$1" | sed -e "s/^--//" -e "s/-/_/g")" shift - declare "${var_name}"="$1" + declare "${var_name?}"="$1" ;; *) echo "Invalid command line flag $1" >&2 @@ -499,7 +499,7 @@ nginx_update_app_configuration() { ) var_name="$(echo "$1" | sed -e "s/^--//" -e "s/-/_/g")" shift - read -r -a "$var_name" <<<"$1" + read -r -a "${var_name?}" <<<"$1" ;; # Common flags --enable-http \ @@ -508,7 +508,7 @@ nginx_update_app_configuration() { | --disable-https \ ) var_name="$(echo "$1" | sed -e "s/^--//" -e "s/-/_/g")" - declare "${var_name}=yes" + declare "${var_name?}=yes" ;; --server-name \ | --http-port \ @@ -516,7 +516,7 @@ nginx_update_app_configuration() { ) var_name="$(echo "$1" | sed -e "s/^--//" -e "s/-/_/g")" shift - declare "${var_name}=${1}" + declare "${var_name?}=${1}" ;; *)