From d929d576e58b269bcb66e8b94207c29127a7286a Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Wed, 30 Aug 2023 01:20:34 +0200 Subject: [PATCH] [bitnami/harbor-portal] Release 2.9.0-debian-11-r0 (#46597) Signed-off-by: Bitnami Containers --- bitnami/harbor-portal/2/debian-11/Dockerfile | 10 ++++---- .../opt/bitnami/.bitnami_components.json | 2 +- .../opt/bitnami/scripts/libvalidations.sh | 8 +++---- .../debian-11/prebuildfs/usr/sbin/run-script | 24 +++++++++++++++++++ .../harbor-portal/2/debian-11/tags-info.yaml | 2 +- 5 files changed, 35 insertions(+), 11 deletions(-) create mode 100755 bitnami/harbor-portal/2/debian-11/prebuildfs/usr/sbin/run-script diff --git a/bitnami/harbor-portal/2/debian-11/Dockerfile b/bitnami/harbor-portal/2/debian-11/Dockerfile index a04f93adcb19..ed9a00fc769f 100644 --- a/bitnami/harbor-portal/2/debian-11/Dockerfile +++ b/bitnami/harbor-portal/2/debian-11/Dockerfile @@ -7,13 +7,13 @@ 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-08-26T10:31:29Z" \ + org.opencontainers.image.created="2023-08-29T22:15:45Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.8.4-debian-11-r9" \ + org.opencontainers.image.ref.name="2.9.0-debian-11-r0" \ org.opencontainers.image.title="harbor-portal" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="2.8.4" + org.opencontainers.image.version="2.9.0" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -28,7 +28,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ COMPONENTS=( \ "nginx-1.25.2-1-linux-${OS_ARCH}-debian-11" \ "render-template-1.0.5-13-linux-${OS_ARCH}-debian-11" \ - "harbor-2.8.4-1-linux-${OS_ARCH}-debian-11" \ + "harbor-2.9.0-0-linux-${OS_ARCH}-debian-11" \ ) && \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ @@ -49,7 +49,7 @@ RUN ln -sf /dev/stderr /opt/bitnami/nginx/logs/error.log COPY rootfs / RUN /opt/bitnami/scripts/nginx/postunpack.sh RUN /opt/bitnami/scripts/harbor-portal/postunpack.sh -ENV APP_VERSION="2.8.4" \ +ENV APP_VERSION="2.9.0" \ BITNAMI_APP_NAME="harbor-portal" \ NGINX_HTTPS_PORT_NUMBER="" \ NGINX_HTTP_PORT_NUMBER="" \ diff --git a/bitnami/harbor-portal/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/harbor-portal/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index fa603bf5216f..cbefaab50258 100644 --- a/bitnami/harbor-portal/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/harbor-portal/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,7 +3,7 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.8.4-1" + "version": "2.9.0-0" }, "nginx": { "arch": "amd64", diff --git a/bitnami/harbor-portal/2/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh b/bitnami/harbor-portal/2/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh index 54987abca42a..16183f62d080 100644 --- a/bitnami/harbor-portal/2/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh +++ b/bitnami/harbor-portal/2/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh @@ -4,7 +4,7 @@ # # Validation functions library -# shellcheck disable=SC1091 +# shellcheck disable=SC1091,SC2086 # Load Generic Libraries . /opt/bitnami/scripts/liblog.sh @@ -203,7 +203,7 @@ validate_ipv6() { if [[ $ip =~ $full_address_regex || $ip =~ $short_address_regex || $ip == "::" ]]; then stat=0 fi - return "$stat" + return $stat } ######################## @@ -223,7 +223,7 @@ validate_ipv4() { && ${ip_array[2]} -le 255 && ${ip_array[3]} -le 255 ]] stat=$? fi - return "$stat" + return $stat } ######################## @@ -242,7 +242,7 @@ validate_ip() { else stat=$(validate_ipv6 "$ip") fi - return "$stat" + return $stat } ######################## diff --git a/bitnami/harbor-portal/2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/harbor-portal/2/debian-11/prebuildfs/usr/sbin/run-script new file mode 100755 index 000000000000..4ca0f897277e --- /dev/null +++ b/bitnami/harbor-portal/2/debian-11/prebuildfs/usr/sbin/run-script @@ -0,0 +1,24 @@ +#!/bin/sh +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 +set -u + +if [ $# -eq 0 ]; then + >&2 echo "No arguments provided" + exit 1 +fi + +script=$1 +exit_code="${2:-96}" +fail_if_not_present="${3:-n}" + +if test -f "$script"; then + sh $script + + if [ $? -ne 0 ]; then + exit $((exit_code)) + fi +elif [ "$fail_if_not_present" = "y" ]; then + >&2 echo "script not found: $script" + exit 127 +fi diff --git a/bitnami/harbor-portal/2/debian-11/tags-info.yaml b/bitnami/harbor-portal/2/debian-11/tags-info.yaml index 30cf3d9ab845..6a4080a5f75e 100644 --- a/bitnami/harbor-portal/2/debian-11/tags-info.yaml +++ b/bitnami/harbor-portal/2/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "2" - 2-debian-11 -- 2.8.4 +- 2.9.0 - latest