From 5ef679d8f1547bb993ba7983d6393e038aaddfe9 Mon Sep 17 00:00:00 2001
From: Aditya Manthramurthy <donatello@users.noreply.github.com>
Date: Thu, 12 Jan 2023 01:35:47 -0800
Subject: [PATCH] Simplify/speedup container image publishing script (#16403)

---
 docker-buildx.sh | 37 ++++++++-----------------------------
 1 file changed, 8 insertions(+), 29 deletions(-)

diff --git a/docker-buildx.sh b/docker-buildx.sh
index e23aac4b6..53785c965 100755
--- a/docker-buildx.sh
+++ b/docker-buildx.sh
@@ -5,41 +5,20 @@ sudo sysctl net.ipv6.conf.all.disable_ipv6=0
 release=$(git describe --abbrev=0 --tags)
 
 docker buildx build --push --no-cache \
-       --build-arg RELEASE="${release}" -t "minio/minio:latest" \
+       --build-arg RELEASE="${release}" \
+       -t "minio/minio:latest" \
+       -t "quay.io/minio/minio:latest" \
+       -t "minio/minio:${release}" \
+       -t "quay.io/minio/minio:${release}" \
        --platform=linux/arm64,linux/amd64,linux/ppc64le,linux/s390x \
        -f Dockerfile.release .
 
 docker buildx prune -f
 
 docker buildx build --push --no-cache \
-       --build-arg RELEASE="${release}" -t "quay.io/minio/minio:latest" \
-       --platform=linux/arm64,linux/amd64,linux/ppc64le,linux/s390x \
-       -f Dockerfile.release .
-
-docker buildx prune -f
-
-docker buildx build --push --no-cache \
-       --build-arg RELEASE="${release}" -t "minio/minio:${release}" \
-       --platform=linux/arm64,linux/amd64,linux/ppc64le,linux/s390x \
-       -f Dockerfile.release .
-
-docker buildx prune -f
-
-docker buildx build --push --no-cache \
-       --build-arg RELEASE="${release}" -t "quay.io/minio/minio:${release}" \
-       --platform=linux/arm64,linux/amd64,linux/ppc64le,linux/s390x \
-       -f Dockerfile.release .
-
-docker buildx prune -f
-
-docker buildx build --push --no-cache \
-       --build-arg RELEASE="${release}" -t "minio/minio:${release}.fips" \
-       --platform=linux/amd64 -f Dockerfile.release.fips .
-
-docker buildx prune -f
-
-docker buildx build --push --no-cache \
-       --build-arg RELEASE="${release}" -t "quay.io/minio/minio:${release}.fips" \
+       --build-arg RELEASE="${release}" \
+       -t "minio/minio:${release}.fips" \
+       -t "quay.io/minio/minio:${release}.fips" \
        --platform=linux/amd64 -f Dockerfile.release.fips .
 
 docker buildx prune -f