From 3f7b160fcbbee29892056e9c2165cdeee3dcd78a Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Wed, 6 Dec 2023 18:28:17 +0100 Subject: [PATCH] [bitnami/harbor-adapter-trivy] Release 2.9.1-debian-11-r1 (#53453) Signed-off-by: Bitnami Containers --- .../2/debian-11/Dockerfile | 18 +++++++++--------- .../opt/bitnami/.bitnami_components.json | 2 +- .../2/debian-11/prebuildfs/usr/sbin/run-script | 2 +- bitnami/harbor-adapter-trivy/README.md | 6 ++---- 4 files changed, 13 insertions(+), 15 deletions(-) diff --git a/bitnami/harbor-adapter-trivy/2/debian-11/Dockerfile b/bitnami/harbor-adapter-trivy/2/debian-11/Dockerfile index 59159bd0186fb..8bb164b6e3a6e 100644 --- a/bitnami/harbor-adapter-trivy/2/debian-11/Dockerfile +++ b/bitnami/harbor-adapter-trivy/2/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-11-10T13:16:20Z" \ + org.opencontainers.image.created="2023-12-06T16:39:06Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.9.1-debian-11-r0" \ + org.opencontainers.image.ref.name="2.9.1-debian-11-r1" \ org.opencontainers.image.title="harbor-adapter-trivy" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="2.9.1" @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "harbor-adapter-trivy-2.9.1-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "harbor-adapter-trivy-2.9.1-1-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; 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' && \ + 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 && \ diff --git a/bitnami/harbor-adapter-trivy/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/harbor-adapter-trivy/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 960cfa8f878cd..74676629aa27d 100644 --- a/bitnami/harbor-adapter-trivy/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/harbor-adapter-trivy/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.9.1-0" + "version": "2.9.1-1" } } \ No newline at end of file diff --git a/bitnami/harbor-adapter-trivy/2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/harbor-adapter-trivy/2/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/harbor-adapter-trivy/2/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/harbor-adapter-trivy/2/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/harbor-adapter-trivy/README.md b/bitnami/harbor-adapter-trivy/README.md index 98efdc795161f..020f61fc5dd04 100644 --- a/bitnami/harbor-adapter-trivy/README.md +++ b/bitnami/harbor-adapter-trivy/README.md @@ -1,4 +1,4 @@ -# Harbor Adapter Trivy packaged by Bitnami +# Bitnami package for Harbor Adapter Trivy ## What is Harbor Adapter Trivy? @@ -22,12 +22,10 @@ docker-compose up * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. -Bitnami containers can be used with [Kubeapps](https://kubeapps.dev/) for deployment and management of Helm Charts in clusters. - Looking to use Harbor Adapter Trivy in production? Try [VMware Tanzu Application Catalog](https://bitnami.com/enterprise), the enterprise edition of Bitnami Application Catalog. ## Why use a non-root container?