From 37383ecd09b5fa070185a3c71806ddece5cbb54a Mon Sep 17 00:00:00 2001 From: Ramon de Klein Date: Sun, 18 Aug 2024 09:13:33 +0200 Subject: [PATCH] Ensure that sig/sha are in the same layer (#20282) --- Dockerfile.hotfix | 8 ++------ Dockerfile.release | 8 ++------ Dockerfile.release.fips | 8 ++------ Dockerfile.release.old_cpu | 8 ++------ 4 files changed, 8 insertions(+), 24 deletions(-) diff --git a/Dockerfile.hotfix b/Dockerfile.hotfix index 5c87fdaf1..9f7ec0f3f 100644 --- a/Dockerfile.hotfix +++ b/Dockerfile.hotfix @@ -54,12 +54,8 @@ ENV MINIO_ACCESS_KEY_FILE=access_key \ MC_CONFIG_DIR=/tmp/.mc 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.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/minio* /usr/bin/ +COPY --from=build /go/bin/mc* /usr/bin/ COPY --from=build /go/bin/cur* /usr/bin/ COPY CREDITS /licenses/CREDITS diff --git a/Dockerfile.release b/Dockerfile.release index ca0c3e688..545433f23 100644 --- a/Dockerfile.release +++ b/Dockerfile.release @@ -54,12 +54,8 @@ ENV MINIO_ACCESS_KEY_FILE=access_key \ MC_CONFIG_DIR=/tmp/.mc 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.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/minio* /usr/bin/ +COPY --from=build /go/bin/mc* /usr/bin/ COPY --from=build /go/bin/cur* /usr/bin/ COPY CREDITS /licenses/CREDITS diff --git a/Dockerfile.release.fips b/Dockerfile.release.fips index b0e4fc8b7..b860dead5 100644 --- a/Dockerfile.release.fips +++ b/Dockerfile.release.fips @@ -52,12 +52,8 @@ ENV MINIO_ACCESS_KEY_FILE=access_key \ MINIO_CONFIG_ENV_FILE=config.env 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.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/minio* /usr/bin/ +COPY --from=build /go/bin/mc* /usr/bin/ 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 e3bddee45..96cd8e968 100644 --- a/Dockerfile.release.old_cpu +++ b/Dockerfile.release.old_cpu @@ -54,12 +54,8 @@ ENV MINIO_ACCESS_KEY_FILE=access_key \ MC_CONFIG_DIR=/tmp/.mc 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.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/minio* /usr/bin/ +COPY --from=build /go/bin/mc* /usr/bin/ COPY --from=build /go/bin/cur* /usr/bin/ COPY CREDITS /licenses/CREDITS