update images

.gitlab-ci.yml

@@ -4,6 +4,8 @@ variables:
   IMAGE_NAME: ${CODE_REGISTRY_IMAGE}/${CI_PROJECT_NAME}:${ENVIRONMENT}-${CI_COMMIT_SHORT_SHA}
   UPSTREAM_PATH: ghsc/nshmp/nshmp-apps
 
+image: ${CI_REGISTRY}/devops/images/usgs/node:lts
+
 # Do not run for merge requests
 workflow:
   rules:
@@ -75,10 +77,10 @@ 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
 
@@ -146,7 +148,6 @@ Init:
   artifacts:
     paths:
       - node_modules
-  image: ${DEVOPS_REGISTRY}usgs/node:16
   script:
     - npm ci
   stage: init
@@ -159,7 +160,6 @@ Build Project:
   artifacts:
     paths:
       - dist
-  image: ${DEVOPS_REGISTRY}usgs/node:16
   needs:
     - Init
   script:
@@ -180,8 +180,8 @@ Build Image:
     - build
   variables:
     DOCKER_BUILD_ARGS: |
-      BUILD_IMAGE=${DEVOPS_REGISTRY}usgs/node:16
-      FROM_IMAGE=${DEVOPS_REGISTRY}usgs/nginx:latest
+      BUILD_IMAGE=${CI_REGISTRY}/devops/images/usgs/node:lts
+      FROM_IMAGE=${CI_REGISTRY}/devops/images/usgs/nginx:latest
       USE_DIST=true
 
 ####
@@ -191,13 +191,12 @@ Build Image:
 NPM Audit:
   allow_failure: true
   needs: []
-  image: ${DEVOPS_REGISTRY}usgs/node:16
   script:
     - npm audit
   stage: security
 
 Trivy Docker Scan:
-  image: ${DEVOPS_REGISTRY}usgs/trivy:latest
+  image: ${CI_REGISTRY}/devops/images/usgs/trivy:latest
   needs:
     - Build Image
   rules:
@@ -219,7 +218,6 @@ Trivy Docker Scan:
 ####
 
 Lint:
-  image: ${DEVOPS_REGISTRY}usgs/node:16
   needs:
     - Init
   parallel:
@@ -242,7 +240,6 @@ Unit Tests:
       - coverage/nshmp-apps
     reports:
       junit: junit.xml
-  image: ${DEVOPS_REGISTRY}usgs/node:16
   needs:
     - Init
   script:

Dockerfile

@@ -8,8 +8,8 @@
 #   docker run -p <PORT>:8080 -d <IMAGE_NAME>:<IMAGE_TAG>
 ####
 
-ARG BUILD_IMAGE=usgs/node:latest
-ARG FROM_IMAGE=usgs/nginx:latest
+ARG BUILD_IMAGE=code.usgs.gov:5001/devops/images/usgs/node:lts
+ARG FROM_IMAGE=code.usgs.gov:5001/devops/images/usgs/nginx:latest
 
 ##
 # Builder image, compile Angular source into distribution bundle.