diff --git a/bitnami/oras/0/scratch/Dockerfile b/bitnami/oras/0/scratch/Dockerfile index c31bfef0c925..be6bfc0772e9 100644 --- a/bitnami/oras/0/scratch/Dockerfile +++ b/bitnami/oras/0/scratch/Dockerfile @@ -1,5 +1,9 @@ FROM bitnami/minideb:bullseye as builder +ARG TARGETARCH + +ENV OS_ARCH="${TARGETARCH:-amd64}" + COPY prebuildfs / SHELL ["/bin/bash", "-o", "pipefail", "-c"] @@ -7,24 +11,30 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl gzip tar RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ - if [ ! -f oras-0.14.1-0-linux-amd64-debian-11.tar.gz ]; then \ - curl -SsLf https://downloads.bitnami.com/files/stacksmith/oras-0.14.1-0-linux-amd64-debian-11.tar.gz -O ; \ + if [ ! -f oras-0.14.1-0-linux-${OS_ARCH}-debian-11.tar.gz ]; then \ + curl -SsLf https://downloads.bitnami.com/files/stacksmith/oras-0.14.1-0-linux-${OS_ARCH}-debian-11.tar.gz -O ; \ + curl -SsLf https://downloads.bitnami.com/files/stacksmith/oras-0.14.1-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \ fi && \ - echo "408b1fce120fd810413dc8da6369a2a0013b61912dda321ccc60ede96e8d069d oras-0.14.1-0-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \ - tar -zxf oras-0.14.1-0-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ - rm -rf oras-0.14.1-0-linux-amd64-debian-11.tar.gz + sha256sum -c oras-0.14.1-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \ + tar -zxf oras-0.14.1-0-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + rm -rf oras-0.14.1-0-linux-${OS_ARCH}-debian-11.tar.gz ###### 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="0.14.1-scratch-r0" \ + org.opencontainers.image.ref.name="0.14.1-scratch-r1" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/oras" \ org.opencontainers.image.title="oras" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="0.14.1" + COPY prebuildfs / COPY rootfs / COPY --from=builder /opt/bitnami/oras/bin/oras /oras diff --git a/bitnami/oras/README.md b/bitnami/oras/README.md index fcfabfe556e0..9bddb6400ba2 100644 --- a/bitnami/oras/README.md +++ b/bitnami/oras/README.md @@ -30,7 +30,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/). -* [`0`, `0-scratch`, `0.14.1`, `0.14.1-scratch-r0`, `latest` (0/scratch/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/oras/0/scratch/Dockerfile) +* [`0`, `0-scratch`, `0.14.1`, `0.14.1-scratch-r1`, `latest` (0/scratch/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/oras/0/scratch/Dockerfile) Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers).