From 5ce21a7519b85cecb405dc50659dc44fe2880e16 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Thu, 14 Apr 2022 14:40:37 -0600
Subject: [PATCH] push to repo and chs
---
.gitlab-ci.yml | 25 +++++++++++++++++--------
1 file changed, 17 insertions(+), 8 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a6b385565..620437a75 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
variables:
JACOCO_HTML_DIR: ${REPORTS_DIR}/jacoco/test/html
JUNIT_FILES: build/test-results/test/TEST-*.xml
- NSHMP_HAZ_WS_IMAGE: ${CI_REGISTRY_IMAGE}/nshmp-haz-ws:${ENVIRONMENT}-${CI_COMMIT_SHORT_SHA}
+ NSHMP_HAZ_WS_IMAGE: ${CODE_REGISTRY_IMAGE}/nshmp-haz-ws:${ENVIRONMENT}-${CI_COMMIT_SHORT_SHA}
REPORTS_DIR: build/reports
# Do not run for merge requests
@@ -101,19 +101,28 @@ default:
done
- latest_image_name="${CI_REGISTRY_IMAGE}/${CI_PROJECT_NAME}:latest";
- env_image_name="${CI_REGISTRY_IMAGE}/${CI_PROJECT_NAME}:${ENVIRONMENT}-latest";
- - sha_image_name="${CI_REGISTRY_IMAGE}/${CI_PROJECT_NAME}:${IMAGE_TAG}";
+ - chs_sha_image_name="${CODE_REGISTRY_IMAGE}/${CI_PROJECT_NAME}:${IMAGE_TAG}";
+ - chs_env_image_name="${CODE_REGISTRY_IMAGE}/${CI_PROJECT_NAME}:${ENVIRONMENT}-latest";
- |
docker build \
${BUILD_ARGS} \
--pull \
- --tag "${env_image_name}" \
+ --tag "${latest_image_name}" \
--file "${CI_PROJECT_DIR}/${DOCKERFILE}" \
"${CI_PROJECT_DIR}/.";
- - docker push "${env_image_name}";
- - docker tag "${env_image_name}" "${latest_image_name}"
- - docker push "${latest_image_name}"
- - docker tag "${latest_image_name}" "${sha_image_name}"
- - docker push "${sha_image_name}"
+ - docker push "${latest_image_name}";
+ - |
+ docker tag "${latest_image_name}" "${env_image_name}";
+ docker push "${env_image_name}";
+ - |
+ 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 "
--------
--
GitLab