From ccd194bcd6f32037b0d1e224e7f46ddde503a12c Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Mon, 6 Jun 2022 11:47:34 +0000 Subject: [PATCH] 0.28.1-debian-11-r0 release --- bitnami/trivy/0/debian-11/Dockerfile | 27 +++++++++++++++++++ bitnami/trivy/0/debian-11/docker-compose.yml | 4 +++ .../opt/bitnami/.bitnami_components.json | 9 +++++++ .../opt/bitnami/licenses/licenses.txt | 3 +++ .../prebuildfs/usr/sbin/install_packages | 24 +++++++++++++++++ bitnami/trivy/README.md | 4 +-- 6 files changed, 69 insertions(+), 2 deletions(-) create mode 100644 bitnami/trivy/0/debian-11/Dockerfile create mode 100644 bitnami/trivy/0/debian-11/docker-compose.yml create mode 100644 bitnami/trivy/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json create mode 100644 bitnami/trivy/0/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt create mode 100755 bitnami/trivy/0/debian-11/prebuildfs/usr/sbin/install_packages diff --git a/bitnami/trivy/0/debian-11/Dockerfile b/bitnami/trivy/0/debian-11/Dockerfile new file mode 100644 index 000000000000..e19f2290a078 --- /dev/null +++ b/bitnami/trivy/0/debian-11/Dockerfile @@ -0,0 +1,27 @@ +FROM docker.io/bitnami/minideb:bullseye +LABEL maintainer "Bitnami " + +ENV HOME="/" \ + OS_ARCH="amd64" \ + OS_FLAVOUR="debian-11" \ + OS_NAME="linux" + +COPY prebuildfs / +# Install required system packages and dependencies +RUN install_packages ca-certificates curl gzip libc6 procps tar wget +RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stacksmith/trivy-0.28.1-0-linux-amd64-debian-11.tar.gz && \ + echo "57b46d505b560e62aba2c128e0dab3e9ab0bec870a6c5f9019a81cefa968d940 /tmp/bitnami/pkg/cache/trivy-0.28.1-0-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \ + tar -zxf /tmp/bitnami/pkg/cache/trivy-0.28.1-0-linux-amd64-debian-11.tar.gz -P --transform 's|^[^/]*/files|/opt/bitnami|' --wildcards '*/files' && \ + rm -rf /tmp/bitnami/pkg/cache/trivy-0.28.1-0-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 +RUN mkdir /.cache && chmod g+rwX /.cache + +ENV APP_VERSION="0.28.1" \ + BITNAMI_APP_NAME="trivy" \ + PATH="/opt/bitnami/trivy/bin:$PATH" + +USER 1001 +ENTRYPOINT [ "trivy" ] +CMD [ "--help" ] diff --git a/bitnami/trivy/0/debian-11/docker-compose.yml b/bitnami/trivy/0/debian-11/docker-compose.yml new file mode 100644 index 000000000000..37c57ee36b9a --- /dev/null +++ b/bitnami/trivy/0/debian-11/docker-compose.yml @@ -0,0 +1,4 @@ +version: '2' +services: + trivy: + image: docker.io/bitnami/trivy:0 diff --git a/bitnami/trivy/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/trivy/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json new file mode 100644 index 000000000000..b7c8d0884f23 --- /dev/null +++ b/bitnami/trivy/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -0,0 +1,9 @@ +{ + "trivy": { + "arch": "amd64", + "digest": "57b46d505b560e62aba2c128e0dab3e9ab0bec870a6c5f9019a81cefa968d940", + "distro": "debian-11", + "type": "NAMI", + "version": "0.28.1-0" + } +} \ No newline at end of file diff --git a/bitnami/trivy/0/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt b/bitnami/trivy/0/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt new file mode 100644 index 000000000000..c76ba31f3b8a --- /dev/null +++ b/bitnami/trivy/0/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt @@ -0,0 +1,3 @@ +Bitnami containers ship with software bundles. You can find the licenses under: +/opt/bitnami/nami/COPYING +/opt/bitnami/[name-of-bundle]/licenses/[bundle-version].txt diff --git a/bitnami/trivy/0/debian-11/prebuildfs/usr/sbin/install_packages b/bitnami/trivy/0/debian-11/prebuildfs/usr/sbin/install_packages new file mode 100755 index 000000000000..c9577647443b --- /dev/null +++ b/bitnami/trivy/0/debian-11/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/trivy/README.md b/bitnami/trivy/README.md index b03eb95808bd..4e07b1afbeb9 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-10`, `0.28.1`, `0.28.1-debian-10-r10`, `latest` (0/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-trivy/blob/0.28.1-debian-10-r10/0/debian-10/Dockerfile) +* [`0`, `0-debian-11`, `0.28.1`, `0.28.1-debian-11-r0`, `latest` (0/debian-11/Dockerfile)](https://github.com/bitnami/bitnami-docker-trivy/blob/0.28.1-debian-11-r0/0/debian-11/Dockerfile) Subscribe to project updates by watching the [bitnami/trivy GitHub repo](https://github.com/bitnami/bitnami-docker-trivy). @@ -49,7 +49,7 @@ $ docker pull bitnami/trivy:[TAG] If you wish, you can also build the image yourself. ```console -$ docker build -t bitnami/trivy:latest 'https://github.com/bitnami/bitnami-docker-trivy.git#master:0/debian-10' +$ docker build -t bitnami/trivy:latest 'https://github.com/bitnami/bitnami-docker-trivy.git#master:0/debian-11' ``` ## Why use a non-root container?