diff --git a/images/Dockerfile b/images/Dockerfile index 04cc82035..b7a8c5ce5 100644 --- a/images/Dockerfile +++ b/images/Dockerfile @@ -37,7 +37,7 @@ COPY --from=website-build /webapp/out ./web_ui/frontend/out RUN goreleaser --clean --snapshot -FROM hub.opensciencegrid.org/sciauth/scitokens-oauth2-server:release-20231118-1823 AS scitokens-oauth2-server +FROM --platform=linux/amd64 hub.opensciencegrid.org/sciauth/scitokens-oauth2-server:release-20231118-1823 AS scitokens-oauth2-server FROM --platform=linux/amd64 opensciencegrid/software-base:$BASE_OSG_SERIES-el8-$BASE_YUM_REPO diff --git a/images/dev.Dockerfile b/images/dev.Dockerfile index 8402bc0a8..0c8d568fd 100644 --- a/images/dev.Dockerfile +++ b/images/dev.Dockerfile @@ -120,9 +120,13 @@ RUN \ # For S3 tests, we need the minIO server client, so we install based on detected arch RUN if [ "$TARGETARCH" = "amd64" ]; then \ - dnf install -y https://dl.min.io/server/minio/release/linux-amd64/minio-20231202105133.0.0.x86_64.rpm; \ + curl -o minio.rpm https://dl.min.io/server/minio/release/linux-amd64/archive/minio-20231202105133.0.0.x86_64.rpm &&\ + dnf install -y minio.rpm &&\ + rm -f minio.rpm; \ elif [ "$TARGETARCH" = "arm64" ]; then \ - dnf install -y https://dl.min.io/server/minio/release/linux-arm64/minio-20231202105133.0.0.aarch64.rpm; \ + curl -o minio.rpm https://dl.min.io/server/minio/release/linux-arm64/archive/minio-20231202105133.0.0.aarch64.rpm &&\ + dnf install -y minio.rpm &&\ + rm -f minio.rpm; \ fi WORKDIR /app