From 85a6b8250124c2cfe57f70c70ee934ee1d4bfd8c Mon Sep 17 00:00:00 2001
From: shu <sebastian@vanwa.ch>
Date: Tue, 11 Aug 2020 10:36:01 +0000
Subject: [PATCH 1/8] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 81ff14a..e9c65a1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,6 +8,7 @@ build:
   stage: build
   script:
     - docker login -u $DOCKER_USER -p $DOCKER_PASSWORD $DOCKER_REGISTRY
+    - docker buildx build --platform linux/amd64,linux/arm64 .
     - docker build -t $IMAGE_NAME:$CI_COMMIT_SHA .
     - docker build -t $IMAGE_NAME:$CI_COMMIT_REF_NAME .
     - docker build -t $IMAGE_NAME:latest .

From 7d4ff8011bf799fd2436b39c6546a8211fce6380 Mon Sep 17 00:00:00 2001
From: shu <sebastian@vanwa.ch>
Date: Tue, 11 Aug 2020 10:45:12 +0000
Subject: [PATCH 2/8] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e9c65a1..200005b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,3 +1,5 @@
+variables:
+    CI_BUILD_ARCHS: "linux/amd64,linux/arm64"
 stages:
   - build
 
@@ -8,10 +10,6 @@ build:
   stage: build
   script:
     - docker login -u $DOCKER_USER -p $DOCKER_PASSWORD $DOCKER_REGISTRY
-    - docker buildx build --platform linux/amd64,linux/arm64 .
-    - docker build -t $IMAGE_NAME:$CI_COMMIT_SHA .
-    - docker build -t $IMAGE_NAME:$CI_COMMIT_REF_NAME .
-    - docker build -t $IMAGE_NAME:latest .
-    - docker push $IMAGE_NAME:$CI_COMMIT_SHA
-    - docker push $IMAGE_NAME:$CI_COMMIT_REF_NAME
-    - docker push $IMAGE_NAME:latest
+    - docker buildx build --platform $CI_BUILD_ARCHS --tag $IMAGE_NAME:$CI_COMMIT_SHA --push .
+    - docker buildx build --platform $CI_BUILD_ARCHS --tag $IMAGE_NAME:$CI_COMMIT_REF_NAME --push .
+    - docker buildx build --platform $CI_BUILD_ARCHS --tag $IMAGE_NAME:latest --push .

From 7d65a041a004f944850d1e7111586f9bd13e4018 Mon Sep 17 00:00:00 2001
From: shu <sebastian@vanwa.ch>
Date: Tue, 11 Aug 2020 10:47:38 +0000
Subject: [PATCH 3/8] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 200005b..137a4ec 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,6 +10,6 @@ build:
   stage: build
   script:
     - docker login -u $DOCKER_USER -p $DOCKER_PASSWORD $DOCKER_REGISTRY
-    - docker buildx build --platform $CI_BUILD_ARCHS --tag $IMAGE_NAME:$CI_COMMIT_SHA --push .
-    - docker buildx build --platform $CI_BUILD_ARCHS --tag $IMAGE_NAME:$CI_COMMIT_REF_NAME --push .
-    - docker buildx build --platform $CI_BUILD_ARCHS --tag $IMAGE_NAME:latest --push .
+    - docker buildx build --platform $CI_BUILD_ARCHS --progress plain --pull --tag "$IMAGE_NAME:$CI_COMMIT_SHA" --push .
+    - docker buildx build --platform $CI_BUILD_ARCHS --progress plain --pull --tag "$IMAGE_NAME:$CI_COMMIT_REF_NAME" --push .
+    - docker buildx build --platform $CI_BUILD_ARCHS --progress plain --pull --tag "$IMAGE_NAME:latest" --push .

From 7a97668f698ab9421818b7617a9191f55ed5031d Mon Sep 17 00:00:00 2001
From: shu <sebastian@vanwa.ch>
Date: Tue, 11 Aug 2020 10:49:25 +0000
Subject: [PATCH 4/8] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 137a4ec..a167f6b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,6 @@
 variables:
     CI_BUILD_ARCHS: "linux/amd64,linux/arm64"
+    
 stages:
   - build
 
@@ -10,6 +11,6 @@ build:
   stage: build
   script:
     - docker login -u $DOCKER_USER -p $DOCKER_PASSWORD $DOCKER_REGISTRY
-    - docker buildx build --platform $CI_BUILD_ARCHS --progress plain --pull --tag "$IMAGE_NAME:$CI_COMMIT_SHA" --push .
-    - docker buildx build --platform $CI_BUILD_ARCHS --progress plain --pull --tag "$IMAGE_NAME:$CI_COMMIT_REF_NAME" --push .
-    - docker buildx build --platform $CI_BUILD_ARCHS --progress plain --pull --tag "$IMAGE_NAME:latest" --push .
+    - docker buildx build --platform "linux/amd64,linux/arm64" --progress plain --pull --tag "$IMAGE_NAME:$CI_COMMIT_SHA" --push .
+    - docker buildx build --platform "$CI_BUILD_ARCHS" --progress plain --pull --tag "$IMAGE_NAME:$CI_COMMIT_REF_NAME" --push .
+    - docker buildx build --platform "$CI_BUILD_ARCHS" --progress plain --pull --tag "$IMAGE_NAME:latest" --push .

From 9726c3fc71ccdcad7f63b6828cac8917ee30a6c5 Mon Sep 17 00:00:00 2001
From: shu <sebastian@vanwa.ch>
Date: Tue, 11 Aug 2020 10:50:48 +0000
Subject: [PATCH 5/8] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a167f6b..94c2c24 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,5 @@
 variables:
-    CI_BUILD_ARCHS: "linux/amd64,linux/arm64"
+  CI_BUILD_ARCHS: "linux/amd64,linux/arm64"
     
 stages:
   - build
@@ -11,6 +11,6 @@ build:
   stage: build
   script:
     - docker login -u $DOCKER_USER -p $DOCKER_PASSWORD $DOCKER_REGISTRY
-    - docker buildx build --platform "linux/amd64,linux/arm64" --progress plain --pull --tag "$IMAGE_NAME:$CI_COMMIT_SHA" --push .
+    - docker buildx build --platform "$CI_BUILD_ARCHS" --progress plain --pull --tag "$IMAGE_NAME:$CI_COMMIT_SHA" --push .
     - docker buildx build --platform "$CI_BUILD_ARCHS" --progress plain --pull --tag "$IMAGE_NAME:$CI_COMMIT_REF_NAME" --push .
     - docker buildx build --platform "$CI_BUILD_ARCHS" --progress plain --pull --tag "$IMAGE_NAME:latest" --push .

From 0ad8a14cd581c1879fa263f65eddfc2682b90016 Mon Sep 17 00:00:00 2001
From: shu <sebastian@vanwa.ch>
Date: Tue, 11 Aug 2020 10:52:26 +0000
Subject: [PATCH 6/8] Update .gitlab-ci.yml


From 596f2a99ae97c0ef4ed8ff967bc7a6af1f96f973 Mon Sep 17 00:00:00 2001
From: shu <sebastian@vanwa.ch>
Date: Tue, 11 Aug 2020 10:52:41 +0000
Subject: [PATCH 7/8] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 94c2c24..cc33127 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,11 +1,9 @@
-variables:
-  CI_BUILD_ARCHS: "linux/amd64,linux/arm64"
-    
 stages:
   - build
 
 variables:
   IMAGE_NAME: thallian/alpine-s6
+  CI_BUILD_ARCHS: "linux/amd64,linux/arm64"
 
 build:
   stage: build

From 271562739e42783845575a5bea9921d9779ba126 Mon Sep 17 00:00:00 2001
From: shu <sebastian@vanwa.ch>
Date: Tue, 11 Aug 2020 10:54:41 +0000
Subject: [PATCH 8/8] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cc33127..52c44d7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,6 +9,4 @@ build:
   stage: build
   script:
     - docker login -u $DOCKER_USER -p $DOCKER_PASSWORD $DOCKER_REGISTRY
-    - docker buildx build --platform "$CI_BUILD_ARCHS" --progress plain --pull --tag "$IMAGE_NAME:$CI_COMMIT_SHA" --push .
-    - docker buildx build --platform "$CI_BUILD_ARCHS" --progress plain --pull --tag "$IMAGE_NAME:$CI_COMMIT_REF_NAME" --push .
-    - docker buildx build --platform "$CI_BUILD_ARCHS" --progress plain --pull --tag "$IMAGE_NAME:latest" --push .
+    - docker buildx build --platform "$CI_BUILD_ARCHS" --progress plain --pull --tag "$IMAGE_NAME:$CI_COMMIT_SHA" --tag "$IMAGE_NAME:$CI_COMMIT_REF_NAME" --tag "$IMAGE_NAME:latest" --push .