From 89ad3bb3f23ae0cd64951f52818f9f5e279f42b9 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Fri, 2 Sep 2022 06:23:16 +0200 Subject: [PATCH] [bitnami/harbor-registryctl] Release 2.6.0-debian-11-r6 (#4953) Signed-off-by: Bitnami Containers Signed-off-by: Bitnami Containers --- .../harbor-registryctl/2/debian-11/Dockerfile | 34 ++++++++-- .../opt/bitnami/scripts/libcomponent.sh | 65 ------------------- bitnami/harbor-registryctl/README.md | 2 +- 3 files changed, 30 insertions(+), 71 deletions(-) delete mode 100644 bitnami/harbor-registryctl/2/debian-11/prebuildfs/opt/bitnami/scripts/libcomponent.sh diff --git a/bitnami/harbor-registryctl/2/debian-11/Dockerfile b/bitnami/harbor-registryctl/2/debian-11/Dockerfile index 7e2d7ef56dd3..affd483465d5 100644 --- a/bitnami/harbor-registryctl/2/debian-11/Dockerfile +++ b/bitnami/harbor-registryctl/2/debian-11/Dockerfile @@ -6,7 +6,7 @@ ENV HOME="/" \ LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \ org.opencontainers.image.description="Application packaged by Bitnami" \ - org.opencontainers.image.ref.name="2.6.0-debian-11-r5" \ + org.opencontainers.image.ref.name="2.6.0-debian-11-r6" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/harbor-registryctl" \ org.opencontainers.image.title="harbor-registryctl" \ org.opencontainers.image.vendor="VMware, Inc." \ @@ -16,10 +16,34 @@ COPY prebuildfs / SHELL ["/bin/bash", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages acl ca-certificates curl gzip libc6 procps tar -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "harbor-registry" "2.6.0-2" --checksum 539699af18014f2508a604234d418c09dde37ed3232690a2991c8afca996ec29 -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "yq" "4.27.3-0" --checksum 1aa32d853f4ba273642dc4bb9fb50146434f2c44978d02e1728f72a047e50567 -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "harbor-registryctl" "2.6.0-2" --checksum e771c4bb7e525811342afa5c3781180e4780a9b2142f5fd3409eeae377b65f7a -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.14.0-154" --checksum e36c3d90f4fbfbe989f40947fa7c8ab817f12fcf97d3aef893c753a20ce976ab +RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ + if [ ! -f harbor-registry-2.6.0-2-linux-amd64-debian-11.tar.gz ]; then \ + curl -SsLf https://downloads.bitnami.com/files/stacksmith/harbor-registry-2.6.0-2-linux-amd64-debian-11.tar.gz -O ; \ + fi && \ + echo "539699af18014f2508a604234d418c09dde37ed3232690a2991c8afca996ec29 harbor-registry-2.6.0-2-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \ + tar -zxf harbor-registry-2.6.0-2-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + rm -rf harbor-registry-2.6.0-2-linux-amd64-debian-11.tar.gz +RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ + if [ ! -f yq-4.27.3-0-linux-amd64-debian-11.tar.gz ]; then \ + curl -SsLf https://downloads.bitnami.com/files/stacksmith/yq-4.27.3-0-linux-amd64-debian-11.tar.gz -O ; \ + fi && \ + echo "1aa32d853f4ba273642dc4bb9fb50146434f2c44978d02e1728f72a047e50567 yq-4.27.3-0-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \ + tar -zxf yq-4.27.3-0-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + rm -rf yq-4.27.3-0-linux-amd64-debian-11.tar.gz +RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ + if [ ! -f harbor-registryctl-2.6.0-2-linux-amd64-debian-11.tar.gz ]; then \ + curl -SsLf https://downloads.bitnami.com/files/stacksmith/harbor-registryctl-2.6.0-2-linux-amd64-debian-11.tar.gz -O ; \ + fi && \ + echo "e771c4bb7e525811342afa5c3781180e4780a9b2142f5fd3409eeae377b65f7a harbor-registryctl-2.6.0-2-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \ + tar -zxf harbor-registryctl-2.6.0-2-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + rm -rf harbor-registryctl-2.6.0-2-linux-amd64-debian-11.tar.gz +RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ + if [ ! -f gosu-1.14.0-154-linux-amd64-debian-11.tar.gz ]; then \ + curl -SsLf https://downloads.bitnami.com/files/stacksmith/gosu-1.14.0-154-linux-amd64-debian-11.tar.gz -O ; \ + fi && \ + echo "e36c3d90f4fbfbe989f40947fa7c8ab817f12fcf97d3aef893c753a20ce976ab gosu-1.14.0-154-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \ + tar -zxf gosu-1.14.0-154-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + rm -rf gosu-1.14.0-154-linux-amd64-debian-11.tar.gz RUN apt-get update && apt-get upgrade -y && \ rm -r /var/lib/apt/lists /var/cache/apt/archives RUN chmod g+rwX /opt/bitnami diff --git a/bitnami/harbor-registryctl/2/debian-11/prebuildfs/opt/bitnami/scripts/libcomponent.sh b/bitnami/harbor-registryctl/2/debian-11/prebuildfs/opt/bitnami/scripts/libcomponent.sh deleted file mode 100644 index a7b60696daa6..000000000000 --- a/bitnami/harbor-registryctl/2/debian-11/prebuildfs/opt/bitnami/scripts/libcomponent.sh +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/bash -# -# Library for managing Bitnami components - -# Constants -CACHE_ROOT="/tmp/bitnami/pkg/cache" -DOWNLOAD_URL="https://downloads.bitnami.com/files/stacksmith" - -# Functions - -######################## -# Download and unpack a Bitnami package -# Globals: -# OS_NAME -# OS_ARCH -# OS_FLAVOUR -# Arguments: -# $1 - component's name -# $2 - component's version -# Returns: -# None -######################### -component_unpack() { - local name="${1:?name is required}" - local version="${2:?version is required}" - local base_name="${name}-${version}-${OS_NAME}-${OS_ARCH}-${OS_FLAVOUR}" - local package_sha256="" - local directory="/opt/bitnami" - - # Validate arguments - shift 2 - while [ "$#" -gt 0 ]; do - case "$1" in - -c|--checksum) - shift - package_sha256="${1:?missing package checksum}" - ;; - *) - echo "Invalid command line flag $1" >&2 - return 1 - ;; - esac - shift - done - - echo "Downloading $base_name package" - if [ -f "${CACHE_ROOT}/${base_name}.tar.gz" ]; then - echo "${CACHE_ROOT}/${base_name}.tar.gz already exists, skipping download." - cp "${CACHE_ROOT}/${base_name}.tar.gz" . - rm "${CACHE_ROOT}/${base_name}.tar.gz" - if [ -f "${CACHE_ROOT}/${base_name}.tar.gz.sha256" ]; then - echo "Using the local sha256 from ${CACHE_ROOT}/${base_name}.tar.gz.sha256" - package_sha256="$(< "${CACHE_ROOT}/${base_name}.tar.gz.sha256")" - rm "${CACHE_ROOT}/${base_name}.tar.gz.sha256" - fi - else - curl --remote-name --silent --show-error --fail "${DOWNLOAD_URL}/${base_name}.tar.gz" - fi - if [ -n "$package_sha256" ]; then - echo "Verifying package integrity" - echo "$package_sha256 ${base_name}.tar.gz" | sha256sum --check - || return "$?" - fi - tar --directory "${directory}" --extract --gunzip --file "${base_name}.tar.gz" --no-same-owner --strip-components=2 || return "$?" - rm "${base_name}.tar.gz" -} diff --git a/bitnami/harbor-registryctl/README.md b/bitnami/harbor-registryctl/README.md index 7046a203e713..e52437d03f1d 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/). -* [`2`, `2-debian-11`, `2.6.0`, `2.6.0-debian-11-r5`, `latest` (2/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/harbor-registryctl/2/debian-11/Dockerfile) +* [`2`, `2-debian-11`, `2.6.0`, `2.6.0-debian-11-r6`, `latest` (2/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/harbor-registryctl/2/debian-11/Dockerfile) ## Configuration