From beb3a0ebf81c37436daf2c0500fc6002d6c62ec1 Mon Sep 17 00:00:00 2001
From: Andrew Davidson <andrew@andr3w.net>
Date: Tue, 7 Mar 2023 13:08:21 -0800
Subject: [PATCH] fixing build script, multi-arch

---
 build.sh | 34 ++++++++++++----------------------
 1 file changed, 12 insertions(+), 22 deletions(-)

diff --git a/build.sh b/build.sh
index 9381818..6c1ec7d 100644
--- a/build.sh
+++ b/build.sh
@@ -4,27 +4,17 @@ CONTAINER_NAME=samba-container
 CONTAINER_HOST=git.andr3w.net
 CONTAINER_USER=amd
 
-docker buildx build \
-    --platform linux/amd64 \
-    -t $CONTAINER_NAME \
-    -t $CONTAINER_HOST/$CONTAINER_USER/$CONTAINER_NAME:latest \
-    -t $CONTAINER_HOST/$CONTAINER_USER/$CONTAINER_NAME:$(date -I) \
-    .
-
-docker buildx build \
-    --platform linux/arm64 \
-    -t $CONTAINER_NAME \
-    -t $CONTAINER_HOST/$CONTAINER_USER/$CONTAINER_NAME:latest \
-    -t $CONTAINER_HOST/$CONTAINER_USER/$CONTAINER_NAME:$(date -I) \
-    .
-
-docker buildx build \
-    --platform linux/arm/v7 \
-    -t $CONTAINER_NAME \
-    -t $CONTAINER_HOST/$CONTAINER_USER/$CONTAINER_NAME:latest \
-    -t $CONTAINER_HOST/$CONTAINER_USER/$CONTAINER_NAME:$(date -I) \
-    .
-
+echo "### MARK LOGIN "
 echo $PUSH_TOKEN | docker login -u=$PUSH_USER --password-stdin $CONTAINER_HOST
 
-docker push -a $CONTAINER_HOST/$CONTAINER_USER/$CONTAINER_NAME
+echo "### MAKE BUILDER"
+docker buildx create --use --name builder
+
+
+echo "### MARK BUILD"
+docker buildx build --push \
+    --platform linux/amd64,linux/arm64,linux/arm/v7 \
+    -t $CONTAINER_HOST/$CONTAINER_USER/$CONTAINER_NAME \
+    -t $CONTAINER_HOST/$CONTAINER_USER/$CONTAINER_NAME:latest \
+    -t $CONTAINER_HOST/$CONTAINER_USER/$CONTAINER_NAME:$(date -I) \
+    .