From a75a1de9160386cb48fc39b3f53b6815f0f97481 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Fri, 21 Feb 2025 13:41:32 -0700
Subject: [PATCH 1/2] remove chs regiestry
---
.gitlab-ci.yml | 19 ++-----------------
1 file changed, 2 insertions(+), 17 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2d2707dd7..f9ade70e9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
variables:
BASE_HREF: nshmp
GITLAB_TOKEN: '${CI_JOB_TOKEN}'
- IMAGE_NAME: ${CODE_REGISTRY_IMAGE}/${CI_PROJECT_NAME}:${ENVIRONMENT}-${CI_COMMIT_SHORT_SHA}
+ IMAGE_NAME: ${CI_REGISTRY_IMAGE}/${CI_PROJECT_NAME}:${ENVIRONMENT}-${CI_COMMIT_SHORT_SHA}
UPSTREAM_PATH: ghsc/nshmp/nshmp-apps
image: ${CI_REGISTRY}/devops/images/usgs/node:lts
@@ -165,21 +165,6 @@ Build Project:
# Stage: Image
####
-CHS Registry:
- extends:
- - .docker-build
- needs:
- - Build Project
- stage: image
- tags:
- - build
- variables:
- DOCKER_BUILD_ARGS: |
- BUILD_IMAGE=${CI_REGISTRY}/devops/images/usgs/node:20
- FROM_IMAGE=${CI_REGISTRY}/devops/images/usgs/nginx:latest
- USE_DIST=true
- REGISTRY_IMAGE: ${CODE_REGISTRY_IMAGE}
-
Container Registry:
before_script:
- docker login ${CI_REGISTRY} -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD}
@@ -288,7 +273,7 @@ Trigger AWS Deployment:
- *staging-env
- *production-env
needs:
- - CHS Registry
+ - Code Registry
script:
- |
if [ "${ENVIRONMENT}" == 'production' ]; then
--
GitLab
From 697a21b6a1d3206603a35bfcfd28cd26af827e2f Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Fri, 21 Feb 2025 13:42:29 -0700
Subject: [PATCH 2/2] fix needs
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f9ade70e9..7e7f1c29e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -273,7 +273,7 @@ Trigger AWS Deployment:
- *staging-env
- *production-env
needs:
- - Code Registry
+ - Container Registry
script:
- |
if [ "${ENVIRONMENT}" == 'production' ]; then
--
GitLab