From d47bd304a881ed2dc645417e2c3fcd7d0974defc Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Tue, 29 Oct 2024 09:52:22 -0600
Subject: [PATCH 1/3] remove docker hub push
---
.gitlab-ci.yml | 33 ++++++---------------------------
1 file changed, 6 insertions(+), 27 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4241d055..aac909bf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,6 +7,8 @@ variables:
REPORTS_DIR: build/reports
UPSTREAM_PATH: ghsc/nshmp/nshmp-haz
+image: ${CI_REGISTRY}/devops/images/usgs/java:11
+
# Do not run for merge requests
workflow:
rules:
@@ -62,16 +64,6 @@ default:
ENVIRONMENT: production
-####
-# Java Templates
-####
-
-##
-# General Java setup
-##
-.java:
- image: ${DEVOPS_REGISTRY}usgs/amazoncorretto:8
-
####
# Docker Templates
####
@@ -80,10 +72,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
@@ -122,18 +114,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 "
@@ -154,8 +137,8 @@ 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:11
+ FROM_IMAGE=${CI_REGISTRY}/devops/images/usgs/java:11
DOCKERFILE: Dockerfile
IMAGE_TAG: ${ENVIRONMENT}-${CI_COMMIT_SHORT_SHA}
@@ -163,8 +146,6 @@ Build Project:
artifacts:
paths:
- build
- extends:
- - .java
script:
- ./gradlew assemble
stage: build
@@ -174,8 +155,6 @@ Build Project:
####
Test HazardCalc:
- extends:
- - .java
needs:
- Build Project
script:
--
GitLab
From 6894c737a49e43f8116b145024b577a7a5ab3eba Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Tue, 29 Oct 2024 09:52:27 -0600
Subject: [PATCH 2/3] switch images
---
Dockerfile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 2b9d91e7..a94ed4b5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,8 +25,8 @@
# OutOfMemoryError. Increase -Xmx to -Xmx16g or -Xmx24g, if available.
####
-ARG BUILD_IMAGE=usgs/amazoncorretto:8
-ARG FROM_IMAGE=usgs/amazoncorretto:8
+ARG BUILD_IMAGE=code.usgs.gov:5001/devops/images/usgs/java:11
+ARG FROM_IMAGE=code.usgs.gov:5001/devops/images/usgs/java:11
# Project
ARG project=nshmp-haz
--
GitLab
From aafdb20d9eaace6bbc34d3ed2b62b681af25634e Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Tue, 29 Oct 2024 09:54:01 -0600
Subject: [PATCH 3/3] Remove extends
---
.gitlab-ci.yml | 2 --
1 file changed, 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aac909bf..673fa9a4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -172,8 +172,6 @@ Unit Tests:
reports:
junit: ${JUNIT_FILES}
coverage: '/Total.*?([0-9]{1,3})%/'
- extends:
- - .java
needs: []
script:
- ./gradlew check
--
GitLab