From eccd5bcd75f5987635e5d255db2982cf7515dc48 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Wed, 7 Sep 2022 20:26:26 +0200 Subject: [PATCH] [bitnami/trivy] Release 0.31.3-debian-11-r3 (#5490) Signed-off-by: Bitnami Containers Signed-off-by: Bitnami Containers --- bitnami/trivy/0/debian-11/Dockerfile | 24 ++++++++++++++---------- bitnami/trivy/README.md | 2 +- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/bitnami/trivy/0/debian-11/Dockerfile b/bitnami/trivy/0/debian-11/Dockerfile index a3e758eadfe8..8b0c1cf92545 100644 --- a/bitnami/trivy/0/debian-11/Dockerfile +++ b/bitnami/trivy/0/debian-11/Dockerfile @@ -1,28 +1,32 @@ FROM docker.io/bitnami/minideb:bullseye -ENV HOME="/" \ - OS_ARCH="amd64" \ - OS_FLAVOUR="debian-11" \ - OS_NAME="linux" + +ARG TARGETARCH LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \ org.opencontainers.image.description="Application packaged by Bitnami" \ - org.opencontainers.image.ref.name="0.31.3-debian-11-r2" \ + org.opencontainers.image.ref.name="0.31.3-debian-11-r3" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/trivy" \ org.opencontainers.image.title="trivy" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="0.31.3" +ENV HOME="/" \ + OS_ARCH="${TARGETARCH:-amd64}" \ + OS_FLAVOUR="debian-11" \ + OS_NAME="linux" + COPY prebuildfs / SHELL ["/bin/bash", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl gzip libc6 procps tar RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ - if [ ! -f trivy-0.31.3-0-linux-amd64-debian-11.tar.gz ]; then \ - curl -SsLf https://downloads.bitnami.com/files/stacksmith/trivy-0.31.3-0-linux-amd64-debian-11.tar.gz -O ; \ + if [ ! -f trivy-0.31.3-0-linux-${OS_ARCH}-debian-11.tar.gz ]; then \ + curl -SsLf https://downloads.bitnami.com/files/stacksmith/trivy-0.31.3-0-linux-${OS_ARCH}-debian-11.tar.gz -O ; \ + curl -SsLf https://downloads.bitnami.com/files/stacksmith/trivy-0.31.3-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \ fi && \ - echo "63cfb058c342d083415c4a6998a505a4ec91142a34147c421cdec0d901a4b96b trivy-0.31.3-0-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \ - tar -zxf trivy-0.31.3-0-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ - rm -rf trivy-0.31.3-0-linux-amd64-debian-11.tar.gz + sha256sum -c trivy-0.31.3-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \ + tar -zxf trivy-0.31.3-0-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + rm -rf trivy-0.31.3-0-linux-${OS_ARCH}-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/trivy/README.md b/bitnami/trivy/README.md index ddfe31c3f8df..0fcd70aa3d96 100644 --- a/bitnami/trivy/README.md +++ b/bitnami/trivy/README.md @@ -28,7 +28,7 @@ $ docker run --name trivy bitnami/trivy:latest 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/). -* [`0`, `0-debian-11`, `0.31.3`, `0.31.3-debian-11-r2`, `latest` (0/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/trivy/0/debian-11/Dockerfile) +* [`0`, `0-debian-11`, `0.31.3`, `0.31.3-debian-11-r3`, `latest` (0/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/trivy/0/debian-11/Dockerfile) Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers).