diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2d2707dd722c67ea75393f503e9791b8b0316423..7e7f1c29e877935e7c52eb2c5c7d009b382c629e 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 + - Container Registry script: - | if [ "${ENVIRONMENT}" == 'production' ]; then