From 68b41f963a1fe05a053efee5a34f9d39fd2902a0 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 15 Dec 2021 08:55:36 -0700
Subject: [PATCH 1/3] Switch to amazon corretto
---
.gitlab-ci.yml | 10 +++++-----
Dockerfile | 4 ++--
ws.Dockerfile | 4 ++--
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6c98dfb5f..53599a177 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,7 +22,7 @@ stages:
####
.gradle:
- image: ${DEVOPS_REGISTRY}usgs/java:11-jdk
+ image: ${DEVOPS_REGISTRY}usgs/amazoncorretto:11
stage: build
tags:
- development
@@ -45,8 +45,8 @@ Build Image Haz:
variables:
CI_PROJECT_NAME: nshmp-haz
DOCKER_BUILD_ARGS: |
- BUILD_IMAGE=${DEVOPS_REGISTRY}usgs/java:11
- FROM_IMAGE=${DEVOPS_REGISTRY}usgs/java:11
+ BUILD_IMAGE=${DEVOPS_REGISTRY}usgs/amazoncorretto:11
+ FROM_IMAGE=${DEVOPS_REGISTRY}usgs/amazoncorretto:11
CI_JOB_TOKEN=${CI_JOB_TOKEN}
UPSTREAM_PATH: ghsc/nshmp/nshmp-haz
@@ -56,8 +56,8 @@ Build Image WS:
variables:
CI_PROJECT_NAME: nshmp-haz-ws
DOCKER_BUILD_ARGS: |
- BUILD_IMAGE=${DEVOPS_REGISTRY}usgs/java:11
- FROM_IMAGE=${DEVOPS_REGISTRY}usgs/java:11
+ BUILD_IMAGE=${DEVOPS_REGISTRY}usgs/amazoncorretto:11
+ FROM_IMAGE=${DEVOPS_REGISTRY}usgs/amazoncorretto:11
CI_JOB_TOKEN=${CI_JOB_TOKEN}
DOCKERFILE: ws.Dockerfile
UPSTREAM_PATH: ghsc/nshmp/nshmp-haz
diff --git a/Dockerfile b/Dockerfile
index 934d0ee14..367f83e95 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -27,8 +27,8 @@
# docker build -t nshmp-haz .
####
-ARG BUILD_IMAGE=usgs/java:11
-ARG FROM_IMAGE=usgs/java:11
+ARG BUILD_IMAGE=usgs/amazoncorretto:11
+ARG FROM_IMAGE=usgs/amazoncorretto:11
####
# Builder image: Build jar file.
diff --git a/ws.Dockerfile b/ws.Dockerfile
index 542c51e67..8bf60131e 100644
--- a/ws.Dockerfile
+++ b/ws.Dockerfile
@@ -13,8 +13,8 @@
# nshmp-haz-ws
####
-ARG BUILD_IMAGE=usgs/java:11
-ARG FROM_IMAGE=usgs/java:11
+ARG BUILD_IMAGE=usgs/amazoncorretto:11
+ARG FROM_IMAGE=usgs/amazoncorretto:11
####
# Builder image: Build jar file.
--
GitLab
From 71ae652c8e979d12a223657f893aec95b8488ff5 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 15 Dec 2021 09:12:08 -0700
Subject: [PATCH 2/3] Switch to build tag
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 53599a177..e459ee881 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,7 +25,7 @@ stages:
image: ${DEVOPS_REGISTRY}usgs/amazoncorretto:11
stage: build
tags:
- - development
+ - build
####
# Stage: init
--
GitLab
From 5a4720e7a959fe26482f8c5eb60f810ae1ecf715 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 15 Dec 2021 10:21:53 -0700
Subject: [PATCH 3/3] Switch tags
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e459ee881..53599a177 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,7 +25,7 @@ stages:
image: ${DEVOPS_REGISTRY}usgs/amazoncorretto:11
stage: build
tags:
- - build
+ - development
####
# Stage: init
--
GitLab