From 216e297af17529da78d475cb4f9ce07e8e02532b Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Sat, 18 Feb 2023 21:13:21 +0100 Subject: [PATCH] [bitnami/harbor-portal] Release 2.7.0-debian-11-r24 (#24485) Signed-off-by: Bitnami Containers --- bitnami/harbor-portal/2/debian-11/Dockerfile | 10 +++++----- .../prebuildfs/opt/bitnami/.bitnami_components.json | 12 ++++++------ .../debian-11/rootfs/opt/bitnami/scripts/libnginx.sh | 2 +- .../rootfs/opt/bitnami/scripts/nginx/setup.sh | 2 +- bitnami/harbor-portal/README.md | 4 +++- 5 files changed, 16 insertions(+), 14 deletions(-) diff --git a/bitnami/harbor-portal/2/debian-11/Dockerfile b/bitnami/harbor-portal/2/debian-11/Dockerfile index 3c9fd50e8721..dd3054f76e78 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-02-15T18:31:21Z" \ + org.opencontainers.image.created="2023-02-18T19:51:26Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.7.0-debian-11-r23" \ + org.opencontainers.image.ref.name="2.7.0-debian-11-r24" \ org.opencontainers.image.title="harbor-portal" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="2.7.0" @@ -22,10 +22,10 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN install_packages ca-certificates curl libcrypt1 libgeoip1 libpcre3 libssl1.1 procps zlib1g RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ COMPONENTS=( \ - "nginx-1.23.3-1-linux-${OS_ARCH}-debian-11" \ - "render-template-1.0.5-0-linux-${OS_ARCH}-debian-11" \ + "nginx-1.23.3-2-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.5-1-linux-${OS_ARCH}-debian-11" \ "harbor-2.7.0-3-linux-${OS_ARCH}-debian-11" \ - "gosu-1.16.0-1-linux-${OS_ARCH}-debian-11" \ + "gosu-1.16.0-2-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 a4d879880c7c..a275efc7ce45 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 @@ -1,10 +1,10 @@ { "gosu": { "arch": "amd64", - "digest": "9ab9654690d90d3c49ff66fb1eb286487e318adc899d036bc45922f6b176865b", + "digest": "f6056076afb745fd7d9d87d20f71e7248d63330352cf5ae0be2130b7f44a8cfa", "distro": "debian-11", "type": "NAMI", - "version": "1.16.0-1" + "version": "1.16.0-2" }, "harbor": { "arch": "amd64", @@ -15,16 +15,16 @@ }, "nginx": { "arch": "amd64", - "digest": "bb184b4a6fa54bc7bf3fb5d2a861b8219c8769c7b21076fdfe9c74a641b0aa9b", + "digest": "f9ec9c59605b25cc206cf6404764e106ecd0159e49a922e41175b95993c83506", "distro": "debian-11", "type": "NAMI", - "version": "1.23.3-1" + "version": "1.23.3-2" }, "render-template": { "arch": "amd64", - "digest": "57c1d857acbb187fcb98f4ba26d138af9d866f59ad38dd443a75c0a6422de994", + "digest": "185e277977366ec222d2bde1a395ffa138ce1a9d3bdf1df20c3e49e8b8f9c68b", "distro": "debian-11", "type": "NAMI", - "version": "1.0.5-0" + "version": "1.0.5-1" } } \ No newline at end of file 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 bde1ebb2822f..b622b2444474 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 @@ -196,7 +196,7 @@ nginx_initialize() { nginx_configure_port "$NGINX_HTTP_PORT_NUMBER" fi # Configure HTTPS port number - if [[ -n "${NGINX_HTTPS_PORT_NUMBER:-}" ]]; then + if [[ -n "${NGINX_HTTPS_PORT_NUMBER:-}" ]] && [[ -f "${NGINX_SERVER_BLOCKS_DIR}/default-https-server-block.conf" ]]; then nginx_configure_port "$NGINX_HTTPS_PORT_NUMBER" "${NGINX_SERVER_BLOCKS_DIR}/default-https-server-block.conf" fi nginx_configure "absolute_redirect" "$(is_boolean_yes "$NGINX_ENABLE_ABSOLUTE_REDIRECT" && echo "on" || echo "off" )" diff --git a/bitnami/harbor-portal/2/debian-11/rootfs/opt/bitnami/scripts/nginx/setup.sh b/bitnami/harbor-portal/2/debian-11/rootfs/opt/bitnami/scripts/nginx/setup.sh index 789f05547b3d..3fdc013c4b9a 100755 --- a/bitnami/harbor-portal/2/debian-11/rootfs/opt/bitnami/scripts/nginx/setup.sh +++ b/bitnami/harbor-portal/2/debian-11/rootfs/opt/bitnami/scripts/nginx/setup.sh @@ -31,7 +31,7 @@ nginx_custom_init_scripts ! am_i_root || chmod o+w "$(readlink /dev/stdout)" "$(readlink /dev/stderr)" # Configure HTTPS port number -if [[ -n "${NGINX_HTTPS_PORT_NUMBER:-}" ]] && [[ ! -f "${NGINX_SERVER_BLOCKS_DIR}/default-https-server-block.conf" ]] || is_dir_empty "${NGINX_SERVER_BLOCKS_DIR}"; then +if [[ -n "${NGINX_HTTPS_PORT_NUMBER:-}" ]] && [[ ! -f "${NGINX_SERVER_BLOCKS_DIR}/default-https-server-block.conf" ]] && is_file_writable "${NGINX_SERVER_BLOCKS_DIR}/default-https-server-block.conf"; then cp "${BITNAMI_ROOT_DIR}/scripts/nginx/server_blocks/default-https-server-block.conf" "${NGINX_SERVER_BLOCKS_DIR}/default-https-server-block.conf" fi diff --git a/bitnami/harbor-portal/README.md b/bitnami/harbor-portal/README.md index 786cb0402603..a290a3acaaf8 100644 --- a/bitnami/harbor-portal/README.md +++ b/bitnami/harbor-portal/README.md @@ -6,11 +6,13 @@ [Overview of Harbor](https://goharbor.io/) + + ## TL;DR ```console curl -LO https://raw.githubusercontent.com/bitnami/containers/main/bitnami/harbor-portal/docker-compose.yml -curl -L https://github.com/bitnami/containers/archive/main.tar.gz | tar xz --strip=1 --wildcards '*-main/bitnami/harbor-portal/config' && mv bitnami/harbor-portal/config . && rm -rf bitnami +curl -L https://github.com/bitnami/containers/archive/main.tar.gz | tar xz --strip=2 containers-main/bitnami/harbor-portal && cp -RL harbor-portal/config . && rm -rf harbor-portal docker-compose up ```