Skip to content
Snippets Groups Projects
Commit 18789982 authored by Clayton, Brandon Scott's avatar Clayton, Brandon Scott
Browse files

Merge branch 'registry' into 'main'

remove chs registry

See merge request !814
parents 608d7c70 d05c2a17
No related branches found
Tags 2.5.2
1 merge request!814remove chs registry
Pipeline #569502 passed
variables: variables:
JACOCO_HTML_DIR: ${REPORTS_DIR}/jacoco/test/html JACOCO_HTML_DIR: ${REPORTS_DIR}/jacoco/test/html
JUNIT_FILES: build/test-results/test*/TEST-*.xml JUNIT_FILES: build/test-results/test*/TEST-*.xml
NSHMP_HAZ_WS_IMAGE: ${CODE_REGISTRY_IMAGE}/nshmp-haz-ws:${ENVIRONMENT}-${CI_COMMIT_SHORT_SHA} NSHMP_HAZ_WS_IMAGE: ${CI_REGISTRY_IMAGE}/nshmp-haz-ws:${ENVIRONMENT}-${CI_COMMIT_SHORT_SHA}
REPORTS_DIR: build/reports REPORTS_DIR: build/reports
image: ${CI_REGISTRY}/devops/images/usgs/java:11 image: ${CI_REGISTRY}/devops/images/usgs/java:11
...@@ -135,34 +135,10 @@ default: ...@@ -135,34 +135,10 @@ default:
REGISTRY_IMAGE: ${CI_REGISTRY_IMAGE} REGISTRY_IMAGE: ${CI_REGISTRY_IMAGE}
TAG: build TAG: build
#### ####
# Stage: build # Stage: build
#### ####
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: ws.Dockerfile
REGISTRY_IMAGE: ${CODE_REGISTRY_IMAGE}
TAG: build
variables:
DOCKER_BUILD_ARGS: |
BUILD_IMAGE=${CI_REGISTRY}/devops/images/usgs/java:11
FROM_IMAGE=${CI_REGISTRY}/devops/images/usgs/java:11
CI_COMMIT_BRANCH=${CI_COMMIT_BRANCH}
CI_PROJECT_URL=${CI_PROJECT_URL}
UPSTREAM_PATH: ghsc/nshmp/nshmp-haz
Container Registry: Container Registry:
before_script: before_script:
- docker login ${CI_REGISTRY} -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD} - docker login ${CI_REGISTRY} -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment