From 978b49be7780a4c5eca88704a1ddda7c5be1463d Mon Sep 17 00:00:00 2001
From: Jeroen Willemsen <jwillemsen@xebia.com>
Date: Wed, 24 Nov 2021 10:36:16 +0100
Subject: [PATCH 1/2] Test with dmerge4 for running

---
 .github/scripts/docker-create-and-push.sh | 19 ++++++++++---------
 Dockerfile                                |  2 +-
 k8s/secret-challenge-deployment.yml       |  2 +-
 k8s/secret-challenge-vault-deployment.yml |  2 +-
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/.github/scripts/docker-create-and-push.sh b/.github/scripts/docker-create-and-push.sh
index 76b14ce96..21a7281a7 100755
--- a/.github/scripts/docker-create-and-push.sh
+++ b/.github/scripts/docker-create-and-push.sh
@@ -10,14 +10,15 @@ echo "tag supplied: $1"
 echo "tag message: $2"
 echo "buildarg supplied: $3"
 
-git tag -a $1 -m "$2"
-git push --tags
-docker build --build-arg "$3" --build-arg "PORT=8081" --build-arg "argBasedVersion=$1" --build-arg "spring_profile=without-vault" -t jeroenwillemsen/addo-example:$1-no-vault ./../../.
-docker push jeroenwillemsen/addo-example:$1-no-vault
-docker build --build-arg "$3" --build-arg "PORT=8081" --build-arg "argBasedVersion=$1" --build-arg "spring_profile=local-vault" -t jeroenwillemsen/addo-example:$1-local-vault ./../../.
-docker push jeroenwillemsen/addo-example:$1-local-vault
-docker build --build-arg "$3" --build-arg "PORT=8081" --build-arg "argBasedVersion=$1" --build-arg "spring_profile=kubernetes-vault" -t jeroenwillemsen/addo-example:$1-k8s-vault ./../../.
-docker push jeroenwillemsen/addo-example:$1-k8s-vault
+#echo "tagging version"
+#git tag -a $1 -m "$2"
+#git push --tags
+
+docker buildx use mybuilder
+echo "creating containers"
+docker buildx build --platform linux/amd64,linux/arm64 -t jeroenwillemsen/addo-example:$1-no-vault --build-arg "$3" --build-arg "PORT=8081" --build-arg "argBasedVersion=$1" --build-arg "spring_profile=without-vault" --push ./../../.
+docker buildx build --platform linux/amd64,linux/arm64 -t jeroenwillemsen/addo-example:$1-local-vault --build-arg "$3" --build-arg "PORT=8081" --build-arg "argBasedVersion=$1" --build-arg "spring_profile=local-vault" --push ./../../.
+docker buildx build --platform linux/amd64,linux/arm64 -t jeroenwillemsen/addo-example:$1-k8s-vault --build-arg "$3" --build-arg "PORT=8081" --build-arg "argBasedVersion=$1" --build-arg "spring_profile=kubernetes-vault" --push ./../../.
 #staging (https://arcane-scrubland-42646.herokuapp.com/)
-echo "Completed docker upload, now taking care of heroku, do yourself: update Dockerfile.web, then run 'heroku container:login' 'heroku container:push --recursive --arg argBasedVersion=$1heroku' and 'heroku container:push --recursive --arg argBasedVersion=$1heroku --app=wrongsecrets' and release both (heroku container:release web --app=wrongsecrets)"
+echo "Completed docker upload for X86, now taking care of heroku, do yourself: update Dockerfile.web, then run 'heroku container:login' 'heroku container:push --recursive --arg argBasedVersion=$1heroku' and 'heroku container:push --recursive --arg argBasedVersion=$1heroku --app=wrongsecrets' and release both (heroku container:release web --app=wrongsecrets)"
 #want to release? do heroku container:release web --app=wrongsecrets
diff --git a/Dockerfile b/Dockerfile
index 80af6cd10..bb1ca5a31 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM azul/zulu-openjdk-alpine:15
+FROM eclipse-temurin:17_35-jdk-focal
 
 ARG argBasedPassword="default"
 ARG argBasedVersion="0.0.0"
diff --git a/k8s/secret-challenge-deployment.yml b/k8s/secret-challenge-deployment.yml
index d5df8c7b6..10d244d6c 100644
--- a/k8s/secret-challenge-deployment.yml
+++ b/k8s/secret-challenge-deployment.yml
@@ -25,7 +25,7 @@ spec:
       name: secret-challenge
     spec:
       containers:
-        - image: jeroenwillemsen/addo-example:1.0.3-no-vault
+        - image: jeroenwillemsen/addo-example:dmerge4-no-vault
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 8080
diff --git a/k8s/secret-challenge-vault-deployment.yml b/k8s/secret-challenge-vault-deployment.yml
index 0f402c9f2..bf3870edb 100644
--- a/k8s/secret-challenge-vault-deployment.yml
+++ b/k8s/secret-challenge-vault-deployment.yml
@@ -26,7 +26,7 @@ spec:
     spec:
       serviceAccountName: vault
       containers:
-        - image: jeroenwillemsen/addo-example:1.0.3-k8s-vault
+        - image: jeroenwillemsen/addo-example:dmerge4-k8s-vault
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 8080

From 53da0aebf7845cf7ac908b33372e30a162ed9d49 Mon Sep 17 00:00:00 2001
From: Jeroen Willemsen <jwillemsen@xebia.com>
Date: Wed, 24 Nov 2021 10:50:03 +0100
Subject: [PATCH 2/2] Updated scripts

---
 .github/scripts/docker-create-and-push.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/scripts/docker-create-and-push.sh b/.github/scripts/docker-create-and-push.sh
index 21a7281a7..9226a4c5a 100755
--- a/.github/scripts/docker-create-and-push.sh
+++ b/.github/scripts/docker-create-and-push.sh
@@ -10,10 +10,10 @@ echo "tag supplied: $1"
 echo "tag message: $2"
 echo "buildarg supplied: $3"
 
-#echo "tagging version"
-#git tag -a $1 -m "$2"
-#git push --tags
-
+echo "tagging version"
+git tag -a $1 -m "$2"
+git push --tags
+docker buildx create --name mybuilder
 docker buildx use mybuilder
 echo "creating containers"
 docker buildx build --platform linux/amd64,linux/arm64 -t jeroenwillemsen/addo-example:$1-no-vault --build-arg "$3" --build-arg "PORT=8081" --build-arg "argBasedVersion=$1" --build-arg "spring_profile=without-vault" --push ./../../.