From df0133c6e48c0b9706d00b7fdd918cf83b157436 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Tue, 29 Oct 2024 09:26:19 -0600
Subject: [PATCH] update docker image and dont push to docker hub
---
.gitlab-ci.yml | 31 ++++++-------------------------
1 file changed, 6 insertions(+), 25 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ee30d24b..5442f8a3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,6 +4,8 @@ variables:
PRODUCTION_BRANCH: legacy-ws-production
UPSTREAM_PATH: ghsc/nshmp/nshmp-haz
+image: ${CI_REGISTRY}/devops/images/usgs/java:8
+
# Do not run for merge requests
workflow:
rules:
@@ -58,16 +60,6 @@ default:
variables:
ENVIRONMENT: production
-####
-# Java Templates
-####
-
-##
-# General Java setup
-##
-.java:
- image: ${DEVOPS_REGISTRY}usgs/amazoncorretto:8
-
####
# Docker Templates
####
@@ -76,10 +68,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
@@ -118,18 +110,9 @@ default:
docker tag "${env_image_name}" "${sha_image_name}";
docker push "${sha_image_name}";
- |
- docker_latest_image="usgs/${CI_PROJECT_NAME}:latest";
- docker_env_image="usgs/${CI_PROJECT_NAME}:${ENVIRONMENT}-latest";
-
- docker tag "${env_image_name}" "${docker_env_image}";
- docker push "${docker_env_image}";
-
if [[ "${ENVIRONMENT}" != "development" ]]; then
docker tag "${env_image_name}" "${latest_image_name}";
docker push "${latest_image_name}";
-
- docker tag "${env_image_name}" "${docker_latest_image}";
- docker push "${docker_latest_image}";
fi
- |
printf "
@@ -150,14 +133,12 @@ Build Image:
- .docker-build
variables:
DOCKER_BUILD_ARGS: |
- BUILD_IMAGE=${DEVOPS_REGISTRY}usgs/amazoncorretto:8
- FROM_IMAGE=${DEVOPS_REGISTRY}usgs/amazoncorretto:8
+ BUILD_IMAGE=${CI_REGISTRY}/devops/images/usgs/java:8
+ FROM_IMAGE=${CI_REGISTRY}/devops/images/usgs/java:8
DOCKERFILE: Dockerfile
IMAGE_TAG: ${ENVIRONMENT}-${CI_COMMIT_SHORT_SHA}
Build Project:
- extends:
- - .java
before_script:
- mkdir -p ${DIR}
- mv $(ls -1 | grep -v $(basename $(dirname ${DIR}))) ${DIR}/.
--
GitLab