From e6e4759f57b77be2bda8279afcd7b4e0713230f0 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Mon, 15 May 2023 18:22:38 +0100 Subject: [PATCH] [bitnami/harbor-portal] Release 2.8.1-debian-11-r2 (#33938) Signed-off-by: Bitnami Containers --- bitnami/harbor-portal/2/debian-11/Dockerfile | 6 +++--- .../prebuildfs/opt/bitnami/.bitnami_components.json | 2 +- .../2/debian-11/rootfs/opt/bitnami/scripts/libnginx.sh | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bitnami/harbor-portal/2/debian-11/Dockerfile b/bitnami/harbor-portal/2/debian-11/Dockerfile index 140157855467..f156d050212d 100644 --- a/bitnami/harbor-portal/2/debian-11/Dockerfile +++ b/bitnami/harbor-portal/2/debian-11/Dockerfile @@ -3,10 +3,10 @@ FROM docker.io/bitnami/minideb:bullseye ARG TARGETARCH LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-05-12T17:15:03Z" \ + org.opencontainers.image.created="2023-05-15T16:54:22Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.8.1-debian-11-r1" \ + org.opencontainers.image.ref.name="2.8.1-debian-11-r2" \ org.opencontainers.image.title="harbor-portal" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="2.8.1" @@ -24,7 +24,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ COMPONENTS=( \ "nginx-1.23.4-3-linux-${OS_ARCH}-debian-11" \ "render-template-1.0.5-5-linux-${OS_ARCH}-debian-11" \ - "harbor-2.8.1-0-linux-${OS_ARCH}-debian-11" \ + "harbor-2.8.1-1-linux-${OS_ARCH}-debian-11" \ ) && \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ 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 00bf0ed1e847..cbce4bd9da75 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.1-0" + "version": "2.8.1-1" }, "nginx": { "arch": "amd64", 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 d6c0c60f2cfb..8dffa1576177 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 @@ -643,8 +643,8 @@ nginx_generate_sample_certs() { local certs_dir="${NGINX_CONF_DIR}/bitnami/certs" if ! is_boolean_yes "$NGINX_SKIP_SAMPLE_CERTS" && [[ ! -f "${certs_dir}/server.crt" ]]; then - ensure_dir_exists "$certs_dir" - if is_file_writable "${certs_dir}/server.crt"; then + # Check certificates directory exists and is writable + if [[ -d "$certs_dir" && -w "$certs_dir" ]]; then SSL_KEY_FILE="${certs_dir}/server.key" SSL_CERT_FILE="${certs_dir}/server.crt" SSL_CSR_FILE="${certs_dir}/server.csr" @@ -656,7 +656,7 @@ nginx_generate_sample_certs() { openssl x509 -req -sha256 -in "$SSL_CSR_FILE" -signkey "$SSL_KEY_FILE" -out "$SSL_CERT_FILE" -days 1825 -extfile <(echo -n "$SSL_EXT") rm -f "$SSL_CSR_FILE" else - warn "The certificates directories '${certs_dir}' is not writable, skipping sample HTTPS certificates generation" + warn "The certificates directories '${certs_dir}' does not exist or is not writable, skipping sample HTTPS certificates generation" fi fi }