diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fb25fa498cbb5e7e0405f50f9dfc2bd319aef8f5..2b4c52c3561d8459c70b9b0400360eb77d58709b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,7 +5,7 @@ variables: NODE_IMAGE: ${CODE_REGISTRY_IMAGE}/${CI_PROJECT_NAME}:${CI_COMMIT_REF_SLUG}--node UPSTREAM_PATH: ghsc/nshmp/nshmp-apps -image: ${CI_REGISTRY}/devops/images/usgs/node:lts +image: ${CI_REGISTRY}/devops/images/usgs/node:20 # Do not run for merge requests workflow: @@ -155,7 +155,7 @@ Build Node Image: script: - | docker build \ - --build-arg FROM_IMAGE=${CI_REGISTRY}/devops/images/usgs/node:lts \ + --build-arg FROM_IMAGE=${CI_REGISTRY}/devops/images/usgs/node:20 \ --file ".gitlab/Dockerfile" \ --pull \ --tag ${NODE_IMAGE} \ @@ -202,7 +202,7 @@ Build Image: - build variables: DOCKER_BUILD_ARGS: | - BUILD_IMAGE=${CI_REGISTRY}/devops/images/usgs/node:lts + BUILD_IMAGE=${CI_REGISTRY}/devops/images/usgs/node:20 FROM_IMAGE=${CI_REGISTRY}/devops/images/usgs/nginx:latest USE_DIST=true @@ -317,7 +317,7 @@ pages: artifacts: paths: - public - image: ${DEVOPS_REGISTRY}usgs/node:16 + image: ${DEVOPS_REGISTRY}usgs/node:20 rules: - if: > $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH diff --git a/.gitlab/Dockerfile b/.gitlab/Dockerfile index 61e1f9dd16c32312e13b4f2c2e0eb4530902bffb..c5a2d0ec80bd0eb443ebc53f3aa4a589b0e4f30c 100644 --- a/.gitlab/Dockerfile +++ b/.gitlab/Dockerfile @@ -1,4 +1,4 @@ -ARG FROM_IMAGE=code.usgs.gov:5001/devops/images/usgs/node:lts +ARG FROM_IMAGE=code.usgs.gov:5001/devops/images/usgs/node:20 FROM ${FROM_IMAGE} diff --git a/Dockerfile b/Dockerfile index c803634b079ce889f9f9e3069554a78540ed8580..f7a1d8707c813869727b7d8af73f49d33c0157d4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ # docker run -p <PORT>:8080 -d <IMAGE_NAME>:<IMAGE_TAG> #### -ARG BUILD_IMAGE=code.usgs.gov:5001/devops/images/usgs/node:lts +ARG BUILD_IMAGE=code.usgs.gov:5001/devops/images/usgs/node:20 ARG FROM_IMAGE=code.usgs.gov:5001/devops/images/usgs/nginx:latest ##