remove docker hub push

.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: