Clean up and fix image push to use separate shell processes too

aoe-web-frontend/deploy-scripts/02-push-image.sh

@@ -1,34 +1,14 @@
 #!/usr/bin/env bash
 set -o errexit -o nounset -o pipefail
 
-# shellcheck source=../scripts/common-functions.sh
-source "$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/../../scripts/common-functions.sh"
+push_command="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/scripts/push-configuration.sh"
 
-# shellcheck source=./deploy-functions.sh
-source "$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/../../deploy-scripts/deploy-functions.sh"
-
-function main() {
-  setup
-
-  local aoe_service_name="aoe-web-frontend"
-  local github_image_tag_dev="$github_registry${aoe_service_name}-dev:${IMAGE_TAG}"
-  local github_image_tag_qa="$github_registry${aoe_service_name}-qa:${IMAGE_TAG}"
-  local github_image_tag_prod="$github_registry${aoe_service_name}-prod:${IMAGE_TAG}"
-
-  local ecr_registry="${REGISTRY}/$aoe_service_name"
-  local ecr_image_tag="${ecr_registry}:${IMAGE_TAG}"
-  upload_image_to_ecr "$github_image_tag_dev" "$ecr_image_tag-dev"
-  upload_image_to_ecr "$github_image_tag_qa" "$ecr_image_tag-qa"
-  upload_image_to_ecr "$github_image_tag_prod" "$ecr_image_tag-prod"
+function main {
+  ${push_command} dev
+  ${push_command} qa
+  ${push_command} prod
 }
 
-function setup() {
-  cd "${repo}"
-  require_command docker
-  require_docker_compose
-  configure_aws_credentials
-  get_ecr_login_credentials
-}
+main
 
 
-main "$@"

aoe-web-frontend/deploy-scripts/scripts/build-configuration.sh

@@ -18,7 +18,7 @@ function main {
       echo "Building for configuration ${configuration}"
       ;;
     *)
-      echo "FRONTEND_CONFIGURATION not set to correct value (got $configuration)"
+      echo "Configuration parameter is not correct (got configuration=$configuration)"
       exit 1
       ;;
   esac

aoe-web-frontend/deploy-scripts/scripts/push-image.sh

@@ -0,0 +1,40 @@
+#!/usr/bin/env bash
+set -o errexit -o nounset -o pipefail
+
+# shellcheck source=../scripts/common-functions.sh
+source "$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/../../scripts/common-functions.sh"
+
+# shellcheck source=./deploy-functions.sh
+source "$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/../../../deploy-scripts/deploy-functions.sh"
+
+function main() {
+  setup
+
+  configuration=${1:-none}
+  case $configuration in
+    "dev"|"qa"|"prod")
+      echo "Building for configuration ${configuration}"
+      ;;
+    *)
+      echo "Configuration parameter is not correct (got configuration=$configuration)"
+      exit 1
+      ;;
+  esac
+
+  local aoe_service_name="aoe-web-frontend"
+  local github_image_tag="$github_registry${aoe_service_name}-${configuration}:${IMAGE_TAG}"
+
+  local ecr_registry="${REGISTRY}/$aoe_service_name"
+  local ecr_image_tag="${ecr_registry}:${IMAGE_TAG}"
+  upload_image_to_ecr "$github_image_tag" "$ecr_image_tag-${configuration}"
+}
+
+function setup() {
+  cd "${repo}"
+  require_command docker
+  require_docker_compose
+  configure_aws_credentials
+  get_ecr_login_credentials
+}
+
+main "$@"