make parallel

.gitlab-ci.yml

@@ -84,8 +84,6 @@ default:
 # on default upstream and production upstream branches.
 ##
 .docker-build:
-  before_script:
-    - docker login ${CI_REGISTRY} -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD}
   extends:
     - .dind
   needs: []
@@ -99,11 +97,9 @@ default:
       for arg in ${DOCKER_BUILD_ARGS}; do
         BUILD_ARGS="${BUILD_ARGS} --build-arg ${arg}";
       done
-    - chs_env_image_name="${CODE_REGISTRY_IMAGE}/${CI_PROJECT_NAME}:${ENVIRONMENT}-latest";
-    - chs_sha_image_name="${CODE_REGISTRY_IMAGE}/${CI_PROJECT_NAME}:${IMAGE_TAG}";
-    - env_image_name="${CI_REGISTRY_IMAGE}/${CI_PROJECT_NAME}:${ENVIRONMENT}-latest";
-    - latest_image_name="${CI_REGISTRY_IMAGE}/${CI_PROJECT_NAME}:latest";
-    - sha_image_name="${CI_REGISTRY_IMAGE}/${CI_PROJECT_NAME}:${IMAGE_TAG}";
+    - env_image_name="${REGISTRY_IMAGE}/${CI_PROJECT_NAME}:${ENVIRONMENT}-latest";
+    - latest_image_name="${REGISTRY_IMAGE}/${CI_PROJECT_NAME}:latest";
+    - sha_image_name="${REGISTRY_IMAGE}/${CI_PROJECT_NAME}:${IMAGE_TAG}";
     - |
       docker build \
         ${BUILD_ARGS} \
@@ -118,12 +114,6 @@ default:
     - |
       docker tag "${latest_image_name}" "${sha_image_name}";
       docker push "${sha_image_name}";
-    - |
-      docker tag "${latest_image_name}" "${chs_sha_image_name}";
-      docker push "${chs_sha_image_name}";
-    - |
-      docker tag "${latest_image_name}" "${chs_env_image_name}";
-      docker push "${chs_env_image_name}";
     - |
       printf "
         --------
@@ -132,13 +122,15 @@ default:
       " "${CI_PROJECT_NAME}" "${IMAGE_TAG}";
   stage: build
   tags:
-    - build
+    - ${TAG}
   variables:
     DOCKERFILE: Dockerfile
     DOCKER_BUILD_ARGS: |
       BUILD_IMAGE=${DEVOPS_REGISTRY}usgs/amazoncorretto:11
       FROM_IMAGE=${DEVOPS_REGISTRY}usgs/amazoncorretto:11
     IMAGE_TAG: ${ENVIRONMENT}-${CI_COMMIT_SHORT_SHA}
+    REGISTRY_IMAGE: ${CI_REGISTRY_IMAGE}
+    TAG: build
 
 ####
 # Java Templates
@@ -155,27 +147,50 @@ default:
 # Stage: build
 ####
 
-Build Image Haz:
+CHS Registry:
   extends:
     - .docker-build
+  parallel:
+    matrix:
+      -
+        CI_PROJECT_NAME: nshmp-haz
+        DOCKERFILE: Dockerfile
+        REGISTRY_IMAGE: ${CODE_REGISTRY_IMAGE}
+        TAG: build
+      -
+        CI_PROJECT_NAME: nshmp-haz-ws
+        DOCKERFILE: Dockerfile
+        REGISTRY_IMAGE: ${CODE_REGISTRY_IMAGE}
+        TAG: build
   variables:
-    CI_PROJECT_NAME: nshmp-haz
     DOCKER_BUILD_ARGS: |
       BUILD_IMAGE=${DEVOPS_REGISTRY}usgs/amazoncorretto:11
       FROM_IMAGE=${DEVOPS_REGISTRY}usgs/amazoncorretto:11
       CI_JOB_TOKEN=${CI_JOB_TOKEN}
     UPSTREAM_PATH: ghsc/nshmp/nshmp-haz
 
-Build Image WS:
+Container Registry:
+  before_script:
+    - docker login ${CI_REGISTRY} -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD}
   extends:
     - .docker-build
+  parallel:
+    matrix:
+      -
+        CI_PROJECT_NAME: nshmp-haz
+        DOCKERFILE: Dockerfile
+        REGISTRY_IMAGE: ${CI_REGISTRY_IMAGE}
+        TAG: nshmp
+      -
+        CI_PROJECT_NAME: nshmp-haz-ws
+        DOCKERFILE: Dockerfile
+        REGISTRY_IMAGE: ${CI_REGISTRY_IMAGE}
+        TAG: nshmp
   variables:
-    CI_PROJECT_NAME: nshmp-haz-ws
     DOCKER_BUILD_ARGS: |
       BUILD_IMAGE=${DEVOPS_REGISTRY}usgs/amazoncorretto:11
       FROM_IMAGE=${DEVOPS_REGISTRY}usgs/amazoncorretto:11
       CI_JOB_TOKEN=${CI_JOB_TOKEN}
-    DOCKERFILE: ws.Dockerfile
     UPSTREAM_PATH: ghsc/nshmp/nshmp-haz
 
 Build Project: