Merge branch 'java' into 'main'

Switch to amazon corretto

See merge request !571

.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

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.

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.