diff --git a/bitnami/contour-operator/1.20/scratch/Dockerfile b/bitnami/contour-operator/1.20/scratch/Dockerfile index 41de6ac7078f..4c4141ee052c 100644 --- a/bitnami/contour-operator/1.20/scratch/Dockerfile +++ b/bitnami/contour-operator/1.20/scratch/Dockerfile @@ -1,30 +1,40 @@ FROM bitnami/minideb:bullseye as builder +ARG TARGETARCH + +ENV OS_ARCH="${TARGETARCH:-amd64}" + COPY prebuildfs / SHELL ["/bin/bash", "-o", "pipefail", "-c"] # Install required system packages and dependencies -RUN install_packages ca-certificates curl gzip tar +RUN install_packages ca-certificates curl RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ - if [ ! -f contour-operator-1.20.2-3-linux-amd64-debian-11.tar.gz ]; then \ - curl -SsLf https://downloads.bitnami.com/files/stacksmith/contour-operator-1.20.2-3-linux-amd64-debian-11.tar.gz -O ; \ + if [ ! -f contour-operator-1.20.2-3-linux-${OS_ARCH}-debian-11.tar.gz ]; then \ + curl -SsLf https://downloads.bitnami.com/files/stacksmith/contour-operator-1.20.2-3-linux-${OS_ARCH}-debian-11.tar.gz -O ; \ + curl -SsLf https://downloads.bitnami.com/files/stacksmith/contour-operator-1.20.2-3-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \ fi && \ - echo "2c260153809c4b19706b08b873333a9974e073486e4683642f05d0752ba0fcd6 contour-operator-1.20.2-3-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \ - tar -zxf contour-operator-1.20.2-3-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --wildcards '*/files' && \ - rm -rf contour-operator-1.20.2-3-linux-amd64-debian-11.tar.gz + sha256sum -c contour-operator-1.20.2-3-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \ + tar -zxf contour-operator-1.20.2-3-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + rm -rf contour-operator-1.20.2-3-linux-${OS_ARCH}-debian-11.tar.gz contour-operator-1.20.2-3-linux-${OS_ARCH}-debian-11.tar.gz.sha256 ###### FROM scratch +ARG TARGETARCH + +ENV OS_ARCH="${TARGETARCH:-amd64}" + LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \ org.opencontainers.image.description="Application packaged by Bitnami" \ - org.opencontainers.image.ref.name="1.20.2-scratch-r6" \ + org.opencontainers.image.ref.name="1.20.2-scratch-r7" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/contour-operator" \ org.opencontainers.image.title="contour-operator" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="1.20.2" + COPY prebuildfs / COPY rootfs / COPY --from=builder /opt/bitnami/contour-operator/bin/contour-operator /contour-operator diff --git a/bitnami/contour-operator/README.md b/bitnami/contour-operator/README.md index 6789a857651b..fe17fdb6f3e9 100644 --- a/bitnami/contour-operator/README.md +++ b/bitnami/contour-operator/README.md @@ -30,7 +30,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t - [`1.22`, `1.22-scratch`, `1.22.1`, `1.22.1-scratch-r2`, `latest` (1.22/scratch/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/contour-operator/1.22/scratch/Dockerfile) - [`1.21`, `1.21-scratch`, `1.21.1`, `1.21.1-scratch-r4` (1.21/scratch/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/contour-operator/1.21/scratch/Dockerfile) -- [`1.20`, `1.20-scratch`, `1.20.2`, `1.20.2-scratch-r6` (1.20/scratch/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/contour-operator/1.20/scratch/Dockerfile) +- [`1.20`, `1.20-scratch`, `1.20.2`, `1.20.2-scratch-r7` (1.20/scratch/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/contour-operator/1.20/scratch/Dockerfile) Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers).