From 1089d793dc920c3d869f38898aba36a9f43790a9 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Tue, 29 Oct 2024 10:48:25 -0600
Subject: [PATCH] push to container registry
---
.gitlab-ci.yml | 29 ++++++++++++++++++++++++-----
1 file changed, 24 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2a977fdc5..ef9934cdc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -104,12 +104,12 @@ default:
docker build \
${BUILD_ARGS} \
--pull \
- --tag "${CODE_REGISTRY_IMAGE}/${CI_PROJECT_NAME}:${IMAGE_TAG}" \
+ --tag "${REGISTRY_IMAGE}/${CI_PROJECT_NAME}:${IMAGE_TAG}" \
--file "${CI_PROJECT_DIR}/${DOCKERFILE}" \
"${CI_PROJECT_DIR}/.";
- - docker push "${CODE_REGISTRY_IMAGE}/${CI_PROJECT_NAME}:${IMAGE_TAG}";
- - latest_image_name="${CODE_REGISTRY_IMAGE}/${CI_PROJECT_NAME}:${ENVIRONMENT}-latest";
- - docker tag "${CODE_REGISTRY_IMAGE}/${CI_PROJECT_NAME}:${IMAGE_TAG}" "${latest_image_name}";
+ - docker push "${REGISTRY_IMAGE}/${CI_PROJECT_NAME}:${IMAGE_TAG}";
+ - latest_image_name="${REGISTRY_IMAGE}/${CI_PROJECT_NAME}:${ENVIRONMENT}-latest";
+ - docker tag "${REGISTRY_IMAGE}/${CI_PROJECT_NAME}:${IMAGE_TAG}" "${latest_image_name}";
- docker push "${latest_image_name}";
- |
printf "
@@ -120,6 +120,7 @@ default:
variables:
DOCKERFILE: Dockerfile
IMAGE_TAG: ${ENVIRONMENT}-${CI_COMMIT_SHORT_SHA}
+ REGISTRY_IMAGE: ${CI_REGISTRY_IMAGE}
####
# Stage: init
@@ -152,7 +153,7 @@ Build Project:
# Stage: Image
####
-Build Image:
+CHS Registry:
extends:
- .docker-build
needs:
@@ -165,6 +166,24 @@ Build Image:
BUILD_IMAGE=${CI_REGISTRY}/devops/images/usgs/node:20
FROM_IMAGE=${CI_REGISTRY}/devops/images/usgs/nginx:latest
USE_DIST=true
+ REGISTRY_IMAGE: ${CODE_REGISTRY_IMAGE}
+
+Container Registry:
+ before_script:
+ - docker login ${CI_REGISTRY} -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD}
+ extends:
+ - .docker-build
+ needs:
+ - Build Project
+ stage: image
+ tags:
+ - build
+ variables:
+ DOCKER_BUILD_ARGS: |
+ BUILD_IMAGE=${CI_REGISTRY}/devops/images/usgs/node:20
+ FROM_IMAGE=${CI_REGISTRY}/devops/images/usgs/nginx:latest
+ USE_DIST=true
+ REGISTRY_IMAGE: ${CI_REGISTRY_IMAGE}
####
# Stage: Security
--
GitLab