From da8ea29cfbec38c78d18e7124a2f08f99983dd16 Mon Sep 17 00:00:00 2001
From: roblilleker <robert.lilleker@boomi.com>
Date: Tue, 7 Sep 2021 14:47:52 +0100
Subject: [PATCH 1/5] migrate to ecr

---
 build-docker.sh | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/build-docker.sh b/build-docker.sh
index d194f7da..ae6306c4 100755
--- a/build-docker.sh
+++ b/build-docker.sh
@@ -2,6 +2,7 @@
 
 set -e
 
+FLOW_ECR_REGISTRY="093652424831.dkr.ecr.eu-west-2.amazonaws.com"
 BRANCH_NAME="${bamboo_planRepository_branchName}"
 
 if [ "$BRANCH_NAME" = "" ]; then
@@ -11,14 +12,14 @@ fi
 
 if [ "$BRANCH_NAME" = "develop" ]; then
   # We're building the base branch, so we want to push the "latest" tag
-  docker build -t quay.io/manywho/ui-runtime:latest .
-  docker push quay.io/manywho/ui-runtime:latest
+  docker build -t "${FLOW_ECR_REGISTRY}"/ui-runtime:latest .
+  docker push "${FLOW_ECR_REGISTRY}"/ui-runtime:latest
 fi
 
 # Replace the slashes in branch names with dashes, so we can use it as an image tag
-IMAGE_TAG=`echo ${BRANCH_NAME} | sed -e "s/\//-/g"`
-IMAGE="quay.io/manywho/ui-runtime:${IMAGE_TAG}"
+IMAGE_TAG=$(echo "${BRANCH_NAME}" | sed -e "s/\//-/g")
+IMAGE="${FLOW_ECR_REGISTRY}/ui-runtime:${IMAGE_TAG}"
 
 # We always want to push the "branched" image tag too
-docker build -t ${IMAGE} .
-docker push ${IMAGE}
+docker build -t "${IMAGE}" .
+docker push "${IMAGE}"

From c4bedd5fe1ffd6293a328071e6d75cc48e1c0e52 Mon Sep 17 00:00:00 2001
From: roblilleker <robert.lilleker@boomi.com>
Date: Tue, 7 Sep 2021 15:13:39 +0100
Subject: [PATCH 2/5] migrate to ecr

---
 build-docker.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/build-docker.sh b/build-docker.sh
index ae6306c4..67125096 100755
--- a/build-docker.sh
+++ b/build-docker.sh
@@ -5,6 +5,8 @@ set -e
 FLOW_ECR_REGISTRY="093652424831.dkr.ecr.eu-west-2.amazonaws.com"
 BRANCH_NAME="${bamboo_planRepository_branchName}"
 
+#docker login --username AWS --password "${bamboo_planRepository_branchName}" "${FLOW_ECR_REGISTRY}"
+
 if [ "$BRANCH_NAME" = "" ]; then
   echo "No bamboo_planRepository_branchName environment variable is set" 1>&2
   exit 1

From d8bcd27c5cc60b94c6a3788b88e9d978c8c242f8 Mon Sep 17 00:00:00 2001
From: roblilleker <robert.lilleker@boomi.com>
Date: Tue, 7 Sep 2021 15:22:37 +0100
Subject: [PATCH 3/5] migrate to ecr

---
 build-docker.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-docker.sh b/build-docker.sh
index 67125096..185222fd 100755
--- a/build-docker.sh
+++ b/build-docker.sh
@@ -5,7 +5,7 @@ set -e
 FLOW_ECR_REGISTRY="093652424831.dkr.ecr.eu-west-2.amazonaws.com"
 BRANCH_NAME="${bamboo_planRepository_branchName}"
 
-#docker login --username AWS --password "${bamboo_planRepository_branchName}" "${FLOW_ECR_REGISTRY}"
+docker login --username AWS --password "${bamboo.custom.aws.ecr.password}" "${FLOW_ECR_REGISTRY}"
 
 if [ "$BRANCH_NAME" = "" ]; then
   echo "No bamboo_planRepository_branchName environment variable is set" 1>&2

From 851798b6b9a469d4472c5574b40ec93d7122c8a6 Mon Sep 17 00:00:00 2001
From: roblilleker <robert.lilleker@boomi.com>
Date: Tue, 7 Sep 2021 15:33:59 +0100
Subject: [PATCH 4/5] migrate to ecr

---
 build-docker.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-docker.sh b/build-docker.sh
index 185222fd..7afb72cd 100755
--- a/build-docker.sh
+++ b/build-docker.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 set -e
 

From 5dbd26be8a3785cc5a8d1888e0b41e03a55d4f9c Mon Sep 17 00:00:00 2001
From: roblilleker <robert.lilleker@boomi.com>
Date: Tue, 7 Sep 2021 15:38:29 +0100
Subject: [PATCH 5/5] migrate to ecr

---
 build-docker.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-docker.sh b/build-docker.sh
index 7afb72cd..e6e5258c 100755
--- a/build-docker.sh
+++ b/build-docker.sh
@@ -5,7 +5,7 @@ set -e
 FLOW_ECR_REGISTRY="093652424831.dkr.ecr.eu-west-2.amazonaws.com"
 BRANCH_NAME="${bamboo_planRepository_branchName}"
 
-docker login --username AWS --password "${bamboo.custom.aws.ecr.password}" "${FLOW_ECR_REGISTRY}"
+docker login --username AWS --password "${PASS}" "${FLOW_ECR_REGISTRY}"
 
 if [ "$BRANCH_NAME" = "" ]; then
   echo "No bamboo_planRepository_branchName environment variable is set" 1>&2