From ff27eeebd6bb709318544eb30dafb452acc26dd3 Mon Sep 17 00:00:00 2001
From: ngxson <thichthat@gmail.com>
Date: Fri, 19 May 2023 14:06:06 +0200
Subject: [PATCH] ci: multiarch build and push

---
 scripts/build_and_push.sh | 11 ++---------
 scripts/ci_cd.js          |  2 +-
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/scripts/build_and_push.sh b/scripts/build_and_push.sh
index 7916220..939616e 100755
--- a/scripts/build_and_push.sh
+++ b/scripts/build_and_push.sh
@@ -14,12 +14,5 @@ fi
 cp Dockerfile Dockerfile.tmp
 sed -i "s/portainer-ce:latest/portainer-ce:$TAG/g" Dockerfile.tmp
 
-if [ -z "$MULTIARCH" ]; then
-  docker build -t "$IMAGE:$TAG" -f Dockerfile.tmp .
-else
-  echo "Multi-arch build..."
-  docker buildx create --use desktop-linux
-  docker buildx build --platform=$ARCHS -t "$IMAGE:$TAG" -f Dockerfile.tmp .
-fi
-
-docker push "$IMAGE:$TAG"
+echo "Multi-arch build..."
+docker buildx build --platform=$ARCHS --push -t "$IMAGE:$TAG" -f Dockerfile.tmp .
diff --git a/scripts/ci_cd.js b/scripts/ci_cd.js
index 2a24046..ff777cd 100644
--- a/scripts/ci_cd.js
+++ b/scripts/ci_cd.js
@@ -10,7 +10,7 @@ const shouldRebuild = !!process.argv.join(' ').match(/rebuild=true/);
 
 function build_and_push(tag) {
   const cwd = path.join(__dirname, '..');
-  const command = `TAG=${tag} MULTIARCH=1 ./scripts/build_and_push.sh`;
+  const command = `TAG=${tag} ./scripts/build_and_push.sh`;
 
   return new Promise(resolve => {
     const subproc = spawn('/bin/sh', ['-c', command], { cwd });