From 1d27114fa90416f098b907bfb8b039ead7a92269 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 14 May 2020 22:35:22 +0000 Subject: [PATCH] 1.10.2-debian-10-r40 release --- .../harbor-registryctl/1/debian-10/Dockerfile | 14 +++++------ .../1/debian-10/docker-compose.yml | 2 +- .../prebuildfs/usr/sbin/install_packages | 24 +++++++++++++++++++ bitnami/harbor-registryctl/README.md | 2 +- bitnami/harbor-registryctl/docker-compose.yml | 2 +- 5 files changed, 33 insertions(+), 11 deletions(-) create mode 100755 bitnami/harbor-registryctl/1/debian-10/prebuildfs/usr/sbin/install_packages diff --git a/bitnami/harbor-registryctl/1/debian-10/Dockerfile b/bitnami/harbor-registryctl/1/debian-10/Dockerfile index f61e49859fce..9764f69f0ac4 100644 --- a/bitnami/harbor-registryctl/1/debian-10/Dockerfile +++ b/bitnami/harbor-registryctl/1/debian-10/Dockerfile @@ -1,18 +1,17 @@ FROM docker.io/bitnami/minideb:buster LABEL maintainer "Bitnami " -ENV BITNAMI_PKG_CHMOD="-R g+rwX" \ - HOME="/" \ +ENV HOME="/" \ OS_ARCH="amd64" \ OS_FLAVOUR="debian-10" \ OS_NAME="linux" COPY prebuildfs / # Install required system packages and dependencies -RUN install_packages ca-certificates curl libc6 procps sudo unzip +RUN install_packages ca-certificates curl gzip libc6 procps tar +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "harbor-registry" "1.10.2-0" --checksum 8a47b6a4960e76dd3d533dfaa5e52009fcb9b9d6b84c326a0d111094e9193558 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "yq" "3.3.0-0" --checksum 44c8d8e59396bdec54adbffd26bd98f4a0198e6fc5a280953429d14cefed0868 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "harbor-registryctl" "1.10.2-0" --checksum f313077878b379cfe55b77792312b68fdcb32332261a38475abe29ba30ca9203 -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "harbor-registry" "1.10.2-0" --checksum 8a47b6a4960e76dd3d533dfaa5e52009fcb9b9d6b84c326a0d111094e9193558 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.12.0-0" --checksum 582d501eeb6b338a24f417fededbf14295903d6be55c52d66c52e616c81bcd8c RUN apt-get update && apt-get upgrade -y && \ rm -r /var/lib/apt/lists /var/cache/apt/archives @@ -20,11 +19,10 @@ RUN apt-get update && apt-get upgrade -y && \ COPY rootfs / RUN /opt/bitnami/scripts/harbor-registryctl/postunpack.sh ENV BITNAMI_APP_NAME="harbor-registryctl" \ - BITNAMI_IMAGE_VERSION="1.10.2-debian-10-r39" \ - NAMI_PREFIX="/.nami" \ - PATH="/opt/bitnami/common/bin:/opt/bitnami/harbor-registryctl/bin:/opt/bitnami/harbor-registry/bin:$PATH" + BITNAMI_IMAGE_VERSION="1.10.2-debian-10-r40" \ + PATH="/opt/bitnami/harbor-registry/bin:/opt/bitnami/common/bin:/opt/bitnami/harbor-registryctl/bin:$PATH" -VOLUME [ "/etc/registry", "/etc/registryctl", "/storage", "/var/lib/registry" ] +VOLUME [ "/etc/registry", "/storage", "/var/lib/registry", "/etc/registryctl" ] EXPOSE 8080 8443 diff --git a/bitnami/harbor-registryctl/1/debian-10/docker-compose.yml b/bitnami/harbor-registryctl/1/debian-10/docker-compose.yml index b3b7a11e0b17..e97141b4be59 100644 --- a/bitnami/harbor-registryctl/1/debian-10/docker-compose.yml +++ b/bitnami/harbor-registryctl/1/debian-10/docker-compose.yml @@ -2,7 +2,7 @@ version: '2' services: harbor-registryctl: - image: bitnami/harbor-registryctl:1 + image: docker.io/bitnami/harbor-registryctl:1-debian-10 ports: - 80:8080 environment: diff --git a/bitnami/harbor-registryctl/1/debian-10/prebuildfs/usr/sbin/install_packages b/bitnami/harbor-registryctl/1/debian-10/prebuildfs/usr/sbin/install_packages new file mode 100755 index 000000000000..c9577647443b --- /dev/null +++ b/bitnami/harbor-registryctl/1/debian-10/prebuildfs/usr/sbin/install_packages @@ -0,0 +1,24 @@ +#!/bin/sh +set -e +set -u +export DEBIAN_FRONTEND=noninteractive +n=0 +max=2 +until [ $n -gt $max ]; do + set +e + ( + apt-get update -qq && + apt-get install -y --no-install-recommends "$@" + ) + CODE=$? + set -e + if [ $CODE -eq 0 ]; then + break + fi + if [ $n -eq $max ]; then + exit $CODE + fi + echo "apt failed, retrying" + n=$(($n + 1)) +done +rm -r /var/lib/apt/lists /var/cache/apt/archives diff --git a/bitnami/harbor-registryctl/README.md b/bitnami/harbor-registryctl/README.md index 91536fb388dd..f066fdf2f614 100644 --- a/bitnami/harbor-registryctl/README.md +++ b/bitnami/harbor-registryctl/README.md @@ -41,7 +41,7 @@ Non-root container images add an extra layer of security and are generally recom Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/). -* [`1-debian-10`, `1.10.2-debian-10-r39`, `1`, `1.10.2`, `latest` (1/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-harbor-registryctl/blob/1.10.2-debian-10-r39/1/debian-10/Dockerfile) +* [`1-debian-10`, `1.10.2-debian-10-r40`, `1`, `1.10.2`, `latest` (1/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-harbor-registryctl/blob/1.10.2-debian-10-r40/1/debian-10/Dockerfile) # Configuration diff --git a/bitnami/harbor-registryctl/docker-compose.yml b/bitnami/harbor-registryctl/docker-compose.yml index b3b7a11e0b17..e97141b4be59 100644 --- a/bitnami/harbor-registryctl/docker-compose.yml +++ b/bitnami/harbor-registryctl/docker-compose.yml @@ -2,7 +2,7 @@ version: '2' services: harbor-registryctl: - image: bitnami/harbor-registryctl:1 + image: docker.io/bitnami/harbor-registryctl:1-debian-10 ports: - 80:8080 environment: