diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dbccea95691d36ff78c06679dd3ba9faafb0b050..7af5d90c164c0de33118d4f1f3197409882789b2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,6 +2,8 @@ variables: GITLAB_TOKEN: '${CI_JOB_TOKEN}' NODE_IMAGE_NAME: ${CODE_REGISTRY_IMAGE}/${CI_PROJECT_NAME}:${CI_COMMIT_REF_SLUG}--node +image: ${CI_REGISTRY}/devops/images/usgs/node:lts + # Do not run for merge requests workflow: rules: @@ -28,7 +30,6 @@ Init: paths: - node_modules - example/node_modules - image: ${DEVOPS_REGISTRY}usgs/node:16 script: - npm ci - cd example @@ -40,12 +41,12 @@ Init: #### Build Node Image: - image: ${DEVOPS_REGISTRY}docker:19.03-git + image: ${CI_REGISTRY}/devops/images/usgs/docker:20 needs: [] script: - | docker build \ - --build-arg FROM_IMAGE=${DEVOPS_REGISTRY}usgs/node:16 \ + --build-arg FROM_IMAGE=${CI_REGISTRY}/devops/images/usgs/node:lts \ --file "Dockerfile" \ --pull \ --tag ${NODE_IMAGE_NAME} \ @@ -53,7 +54,7 @@ Build Node Image: - docker push ${NODE_IMAGE_NAME} services: - alias: docker - name: ${DEVOPS_REGISTRY}docker:19.03-dind + name: ${CI_REGISTRY}/devops/images/usgs/docker:20-dind stage: node-image tags: - build @@ -66,7 +67,6 @@ Build Node Image: Audit: allow_failure: true - image: ${DEVOPS_REGISTRY}usgs/node:16 needs: [] script: - npm audit @@ -74,7 +74,6 @@ Audit: Audit Angular: allow_failure: true - image: ${DEVOPS_REGISTRY}usgs/node:16 needs: [] script: - cd example @@ -82,7 +81,6 @@ Audit Angular: stage: build Build Angular: - image: ${DEVOPS_REGISTRY}usgs/node:16 needs: - Init script: @@ -91,7 +89,6 @@ Build Angular: stage: build Lint Angular: - image: ${DEVOPS_REGISTRY}usgs/node:16 needs: - Init script: @@ -100,7 +97,6 @@ Lint Angular: stage: build Lint Project: - image: ${DEVOPS_REGISTRY}usgs/node:16 needs: - Init script: @@ -117,7 +113,6 @@ Angular Unit Tests: - example/coverage/example reports: junit: example/junit.xml - image: ${DEVOPS_REGISTRY}usgs/node:16 needs: - Init script: diff --git a/Dockerfile b/Dockerfile index b02f452d6a08250157099676092d52b569236e26..46b295481e1a099d9449d540fbe9a1c3e9a2d278 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,6 +4,6 @@ FROM ${FROM_IMAGE} USER root -RUN yum install -y git +RUN apt-get install git -y USER usgs-user