From 82f16679009bb6da4f93b5f0655ed752d5d4c256 Mon Sep 17 00:00:00 2001 From: Brandon Clayton <bclayton@usgs.gov> Date: Tue, 30 Jul 2024 10:05:54 -0600 Subject: [PATCH] test --- .gitlab-ci.yml | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2b4c52c35..0fb2c716a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,7 @@ variables: BASE_HREF: nshmp GITLAB_TOKEN: '${CI_JOB_TOKEN}' IMAGE_NAME: ${CODE_REGISTRY_IMAGE}/${CI_PROJECT_NAME}:${ENVIRONMENT}-${CI_COMMIT_SHORT_SHA} - NODE_IMAGE: ${CODE_REGISTRY_IMAGE}/${CI_PROJECT_NAME}:${CI_COMMIT_REF_SLUG}--node + # 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:20 @@ -150,25 +150,25 @@ Init: - npm ci stage: init -Build Node Image: - image: ${CI_REGISTRY}/devops/images/docker:20 - script: - - | - docker build \ - --build-arg FROM_IMAGE=${CI_REGISTRY}/devops/images/usgs/node:20 \ - --file ".gitlab/Dockerfile" \ - --pull \ - --tag ${NODE_IMAGE} \ - . - - docker push ${NODE_IMAGE} - services: - - alias: docker - name: ${CI_REGISTRY}/devops/images/docker:20-dind - stage: init - tags: - - build - variables: - DOCKER_DRIVER: overlay2 +# Build Node Image: +# image: ${CI_REGISTRY}/devops/images/docker:20 +# script: +# - | +# docker build \ +# --build-arg FROM_IMAGE=${CI_REGISTRY}/devops/images/usgs/node:20 \ +# --file ".gitlab/Dockerfile" \ +# --pull \ +# --tag ${NODE_IMAGE} \ +# . +# - docker push ${NODE_IMAGE} +# services: +# - alias: docker +# name: ${CI_REGISTRY}/devops/images/docker:20-dind +# stage: init +# tags: +# - build +# variables: +# DOCKER_DRIVER: overlay2 #### # Stage: Build @@ -179,8 +179,8 @@ Build Project: paths: - dist before_script: - - git config --global --add safe.directory '*' - image: ${NODE_IMAGE} + # - git config --global --add safe.directory '*' + # image: ${NODE_IMAGE} needs: - Init - Build Node Image -- GitLab