From 48e39733aab85e2acb158c9ae65304312e9a0744 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 6 Oct 2022 09:49:16 +0200 Subject: [PATCH] [bitnami/harbor-adapter-trivy] Release 2.6.0-debian-11-r17 (#9009) Signed-off-by: Bitnami Containers Signed-off-by: Bitnami Containers --- .../2/debian-11/Dockerfile | 32 +++++++++---------- bitnami/harbor-adapter-trivy/README.md | 2 +- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/bitnami/harbor-adapter-trivy/2/debian-11/Dockerfile b/bitnami/harbor-adapter-trivy/2/debian-11/Dockerfile index a0b2ec7ad4e0..44ae93b2a102 100644 --- a/bitnami/harbor-adapter-trivy/2/debian-11/Dockerfile +++ b/bitnami/harbor-adapter-trivy/2/debian-11/Dockerfile @@ -4,7 +4,7 @@ ARG TARGETARCH 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-r16" \ + org.opencontainers.image.ref.name="2.6.0-debian-11-r17" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/harbor-adapter-trivy" \ org.opencontainers.image.title="harbor-adapter-trivy" \ org.opencontainers.image.vendor="VMware, Inc." \ @@ -20,22 +20,20 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libc6 procps RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ - if [ ! -f harbor-adapter-trivy-2.6.0-1-linux-${OS_ARCH}-debian-11.tar.gz ]; then \ - curl -SsLf https://downloads.bitnami.com/files/stacksmith/harbor-adapter-trivy-2.6.0-1-linux-${OS_ARCH}-debian-11.tar.gz -O ; \ - curl -SsLf https://downloads.bitnami.com/files/stacksmith/harbor-adapter-trivy-2.6.0-1-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \ - fi && \ - sha256sum -c harbor-adapter-trivy-2.6.0-1-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \ - tar -zxf harbor-adapter-trivy-2.6.0-1-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ - rm -rf harbor-adapter-trivy-2.6.0-1-linux-${OS_ARCH}-debian-11.tar.gz harbor-adapter-trivy-2.6.0-1-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ - if [ ! -f gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz ]; then \ - curl -SsLf https://downloads.bitnami.com/files/stacksmith/gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz -O ; \ - curl -SsLf https://downloads.bitnami.com/files/stacksmith/gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \ - fi && \ - sha256sum -c gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \ - tar -zxf gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ - rm -rf gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -RUN apt-get update && apt-get upgrade -y && \ + for COMPONENT in \ + "harbor-adapter-trivy-2.6.0-1-linux-${OS_ARCH}-debian-11" \ + "gosu-1.14.0-154-linux-${OS_ARCH}-debian-11" ; \ + do \ + if [ ! -f "${COMPONENT}.tar.gz" ]; then \ + curl -SsLf https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz -O ; \ + curl -SsLf https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256 -O ; \ + fi && \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + rm -rf "${COMPONENT}.tar.gz{,sha256}" ; \ + done +RUN apt-get autoremove --purge -y curl && \ + apt-get update && apt-get upgrade -y && \ apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives RUN chmod g+rwX /opt/bitnami diff --git a/bitnami/harbor-adapter-trivy/README.md b/bitnami/harbor-adapter-trivy/README.md index 8d83fdbbf051..8304fe85c502 100644 --- a/bitnami/harbor-adapter-trivy/README.md +++ b/bitnami/harbor-adapter-trivy/README.md @@ -38,7 +38,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-r16`, `latest` (2/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/harbor-adapter-trivy/2/debian-11/Dockerfile) +* [`2`, `2-debian-11`, `2.6.0`, `2.6.0-debian-11-r17`, `latest` (2/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/harbor-adapter-trivy/2/debian-11/Dockerfile) Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers).