switch images

.gitlab-ci.yml

@@ -70,11 +70,12 @@ default:
 ##
 # Docker in Docker
 ##
+
 .dind:
-  image: ${DEVOPS_REGISTRY}docker:19.03-git
+  image: ${CI_REGISTRY}/devops/images/docker:20
   services:
     - alias: docker
-      name: ${DEVOPS_REGISTRY}docker:19.03-dind
+      name: ${CI_REGISTRY}/devops/images/docker:20-dind
   variables:
     DOCKER_DRIVER: overlay2
 
@@ -142,8 +143,8 @@ default:
   variables:
     DOCKERFILE: Dockerfile
     DOCKER_BUILD_ARGS: |
-      BUILD_IMAGE=${DEVOPS_REGISTRY}usgs/amazoncorretto:11
-      FROM_IMAGE=${DEVOPS_REGISTRY}usgs/amazoncorretto:11
+      BUILD_IMAGE=${CI_REGISTRY}/devops/images/usgs/java:11
+      FROM_IMAGE=${CI_REGISTRY}/devops/images/usgs/java:11
     IMAGE_TAG: ${ENVIRONMENT}-${CI_COMMIT_SHORT_SHA}
     PUSH_DOCKER: 'false'
     REGISTRY_IMAGE: ${CI_REGISTRY_IMAGE}
@@ -157,7 +158,7 @@ default:
 # General Java setup
 ##
 .java:
-  image: ${DEVOPS_REGISTRY}usgs/amazoncorretto:11
+  image: ${CI_REGISTRY}/devops/images/usgs/java:11
 
 ####
 # Stage: build
@@ -180,8 +181,8 @@ CHS Registry:
         TAG: build
   variables:
     DOCKER_BUILD_ARGS: |
-      BUILD_IMAGE=${DEVOPS_REGISTRY}usgs/amazoncorretto:11
-      FROM_IMAGE=${DEVOPS_REGISTRY}usgs/amazoncorretto:11
+      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}
     PUSH_DOCKER: 'true'
@@ -206,8 +207,8 @@ Container Registry:
         TAG: nshmp
   variables:
     DOCKER_BUILD_ARGS: |
-      BUILD_IMAGE=${DEVOPS_REGISTRY}usgs/amazoncorretto:11
-      FROM_IMAGE=${DEVOPS_REGISTRY}usgs/amazoncorretto:11
+      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
@@ -292,7 +293,6 @@ Trigger nshmp-haz-ws CDK:
     - *staging-env
     - *production-env
   script:
-    - apk add curl
     - |
       if [ "${ENVIRONMENT}" == 'production' ]; then
         REF="production";

Dockerfile

@@ -27,8 +27,8 @@
 #   docker build -t nshmp-haz .
 ####
 
-ARG BUILD_IMAGE=usgs/amazoncorretto:11
-ARG FROM_IMAGE=usgs/amazoncorretto:11
+ARG BUILD_IMAGE=code.usgs.gov:5001/devops/images/usgs/java:11
+ARG FROM_IMAGE=code.usgs.gov:5001/devops/images/usgs/java:11
 
 ####
 # Builder image: Build jar file.
@@ -69,7 +69,7 @@ WORKDIR /app
 COPY --from=builder /app/build/libs/nshmp-haz.jar .
 COPY scripts scripts
 
-RUN yum install -y jq \
+RUN apit-get install -y jq \
     && echo "{}" > "${CONFIG_FILE}"
 
 ENTRYPOINT [ "bash", "scripts/docker-entrypoint.sh" ]

ws.Dockerfile

@@ -17,8 +17,8 @@
 #       nshmp-haz-ws
 ####
 
-ARG BUILD_IMAGE=usgs/amazoncorretto:11
-ARG FROM_IMAGE=usgs/amazoncorretto:11
+ARG BUILD_IMAGE=code.usgs.gov:5001/devops/images/usgs/java:11
+ARG FROM_IMAGE=code.usgs.gov:5001/devops/images/usgs/java:11
 
 ####
 # Builder image: Build jar file.