From d8dfb57d5cf6248ac57bfbc8b233dd8f9f3fb630 Mon Sep 17 00:00:00 2001 From: Harshavardhana Date: Thu, 15 Aug 2024 12:33:45 -0700 Subject: [PATCH] fix: typos from previous PR #20270 --- Dockerfile.hotfix | 4 ++-- Dockerfile.release | 4 ++-- Dockerfile.release.fips | 11 ++++++++++- Dockerfile.release.old_cpu | 8 ++++---- 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/Dockerfile.hotfix b/Dockerfile.hotfix index 9018049e1..5c87fdaf1 100644 --- a/Dockerfile.hotfix +++ b/Dockerfile.hotfix @@ -56,10 +56,10 @@ ENV MINIO_ACCESS_KEY_FILE=access_key \ COPY --from=build /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ COPY --from=build /go/bin/minio /usr/bin/minio COPY --from=build /go/bin/minio.minisig /usr/bin/minio.minisig -COPY --from=build /go/bin/minio.shasum256 /usr/bin/minio.shasum256 +COPY --from=build /go/bin/minio.sha256sum /usr/bin/minio.sha256sum COPY --from=build /go/bin/mc /usr/bin/mc COPY --from=build /go/bin/mc.minisig /usr/bin/mc.minisig -COPY --from=build /go/bin/mc.shasum256 /usr/bin/mc.shasum256 +COPY --from=build /go/bin/mc.sha256sum /usr/bin/mc.sha256sum COPY --from=build /go/bin/cur* /usr/bin/ COPY CREDITS /licenses/CREDITS diff --git a/Dockerfile.release b/Dockerfile.release index fcdaf206f..ca0c3e688 100644 --- a/Dockerfile.release +++ b/Dockerfile.release @@ -56,10 +56,10 @@ ENV MINIO_ACCESS_KEY_FILE=access_key \ COPY --from=build /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ COPY --from=build /go/bin/minio /usr/bin/minio COPY --from=build /go/bin/minio.minisig /usr/bin/minio.minisig -COPY --from=build /go/bin/minio.shasum256 /usr/bin/minio.shasum256 +COPY --from=build /go/bin/minio.sha256sum /usr/bin/minio.sha256sum COPY --from=build /go/bin/mc /usr/bin/mc COPY --from=build /go/bin/mc.minisig /usr/bin/mc.minisig -COPY --from=build /go/bin/mc.shasum256 /usr/bin/mc.shasum256 +COPY --from=build /go/bin/mc.sha256sum /usr/bin/mc.sha256sum COPY --from=build /go/bin/cur* /usr/bin/ COPY CREDITS /licenses/CREDITS diff --git a/Dockerfile.release.fips b/Dockerfile.release.fips index 7e47fe9fa..b0e4fc8b7 100644 --- a/Dockerfile.release.fips +++ b/Dockerfile.release.fips @@ -17,6 +17,12 @@ RUN curl -s -q https://dl.min.io/server/minio/release/linux-${TARGETARCH}/archiv curl -s -q https://dl.min.io/server/minio/release/linux-${TARGETARCH}/archive/minio.${RELEASE}.fips.sha256sum -o /go/bin/minio.sha256sum && \ chmod +x /go/bin/minio +# Download mc binary and signature files +RUN curl -s -q https://dl.min.io/client/mc/release/linux-${TARGETARCH}/mc.fips -o /go/bin/mc && \ + curl -s -q https://dl.min.io/client/mc/release/linux-${TARGETARCH}/mc.fips.minisig -o /go/bin/mc.minisig && \ + curl -s -q https://dl.min.io/client/mc/release/linux-${TARGETARCH}/mc.fips.sha256sum -o /go/bin/mc.sha256sum && \ + chmod +x /go/bin/mc + RUN if [ "$TARGETARCH" = "amd64" ]; then \ curl -L -s -q https://github.com/moparisthebest/static-curl/releases/latest/download/curl-${TARGETARCH} -o /go/bin/curl; \ chmod +x /go/bin/curl; \ @@ -48,7 +54,10 @@ ENV MINIO_ACCESS_KEY_FILE=access_key \ COPY --from=build /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ COPY --from=build /go/bin/minio /usr/bin/minio COPY --from=build /go/bin/minio.minisig /usr/bin/minio.minisig -COPY --from=build /go/bin/minio.shasum256 /usr/bin/minio.shasum256 +COPY --from=build /go/bin/minio.sha256sum /usr/bin/minio.sha256sum +COPY --from=build /go/bin/mc /usr/bin/mc +COPY --from=build /go/bin/mc.minisig /usr/bin/mc.minisig +COPY --from=build /go/bin/mc.sha256sum /usr/bin/mc.sha256sum COPY --from=build /go/bin/cur* /usr/bin/ COPY CREDITS /licenses/CREDITS diff --git a/Dockerfile.release.old_cpu b/Dockerfile.release.old_cpu index 8269b88b0..e3bddee45 100644 --- a/Dockerfile.release.old_cpu +++ b/Dockerfile.release.old_cpu @@ -14,13 +14,13 @@ RUN apk add -U --no-cache ca-certificates && \ # Download minio binary and signature files RUN curl -s -q https://dl.min.io/server/minio/release/linux-${TARGETARCH}/archive/minio.${RELEASE} -o /go/bin/minio && \ curl -s -q https://dl.min.io/server/minio/release/linux-${TARGETARCH}/archive/minio.${RELEASE}.minisig -o /go/bin/minio.minisig && \ - curl -s -q https://dl.min.io/server/minio/release/linux-${TARGETARCH}/archive/minio.${RELEASE}.shasum256 -o /go/bin/minio.shasum256 && \ + curl -s -q https://dl.min.io/server/minio/release/linux-${TARGETARCH}/archive/minio.${RELEASE}.sha256sum -o /go/bin/minio.sha256sum && \ chmod +x /go/bin/minio # Download mc binary and signature files RUN curl -s -q https://dl.min.io/client/mc/release/linux-${TARGETARCH}/mc -o /go/bin/mc && \ curl -s -q https://dl.min.io/client/mc/release/linux-${TARGETARCH}/mc.minisig -o /go/bin/mc.minisig && \ - curl -s -q https://dl.min.io/client/mc/release/linux-${TARGETARCH}/mc.shasum256 -o /go/bin/mc.shasum256 && \ + curl -s -q https://dl.min.io/client/mc/release/linux-${TARGETARCH}/mc.sha256sum -o /go/bin/mc.sha256sum && \ chmod +x /go/bin/mc RUN if [ "$TARGETARCH" = "amd64" ]; then \ @@ -56,10 +56,10 @@ ENV MINIO_ACCESS_KEY_FILE=access_key \ COPY --from=build /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ COPY --from=build /go/bin/minio /usr/bin/minio COPY --from=build /go/bin/minio.minisig /usr/bin/minio.minisig -COPY --from=build /go/bin/minio.shasum256 /usr/bin/minio.shasum256 +COPY --from=build /go/bin/minio.sha256sum /usr/bin/minio.sha256sum COPY --from=build /go/bin/mc /usr/bin/mc COPY --from=build /go/bin/mc.minisig /usr/bin/mc.minisig -COPY --from=build /go/bin/mc.shasum256 /usr/bin/mc.shasum256 +COPY --from=build /go/bin/mc.sha256sum /usr/bin/mc.sha256sum COPY --from=build /go/bin/cur* /usr/bin/ COPY CREDITS /licenses/CREDITS