Merge branch 'pipelines' into 'main'

Pipelines

See merge request !144

.gitlab-ci.yml

@@ -4,6 +4,8 @@ variables:
   JUNIT_FILES: src/lib/build/test-results/test/TEST-*.xml
   REPORTS_DIR: src/lib/build/reports
 
+image: ${CI_REGISTRY}/devops/images/usgs/java:11
+
 stages:
   - build
   - trigger
@@ -70,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
 
@@ -135,9 +137,6 @@ default:
     - build
   variables:
     DOCKERFILE: Dockerfile
-    DOCKER_BUILD_ARGS: |
-      BUILD_IMAGE=${DEVOPS_REGISTRY}usgs/centos:latest
-      FROM_IMAGE=${DEVOPS_REGISTRY}usgs/centos:latest
     IMAGE_TAG: ${ENVIRONMENT}-${CI_COMMIT_SHORT_SHA}
 
 ####
@@ -154,21 +153,19 @@ Build Image:
     - .docker-build
   variables:
     DOCKER_BUILD_ARGS: |
-      BUILD_IMAGE=${DEVOPS_REGISTRY}usgs/amazoncorretto:11
-      FROM_IMAGE=${DEVOPS_REGISTRY}usgs/amazoncorretto:11
+      BUILD_IMAGE=${CI_REGISTRY}/devops/images/usgs/java:11
+      FROM_IMAGE=${CI_REGISTRY}/devops/images/usgs/java:11
       CI_COMMIT_BRANCH=${CI_COMMIT_BRANCH}
       CI_JOB_TOKEN=${CI_JOB_TOKEN}
       CI_PROJECT_URL=${CI_PROJECT_URL}
     UPSTREAM_PATH: ghsc/nshmp/nshmp-ws-static
 
 Build Project:
-  image: ${DEVOPS_REGISTRY}usgs/amazoncorretto:11
   script:
     - ./gradlew assemble
   stage: build
 
 Markdown Lint:
-  image: ${DEVOPS_REGISTRY}usgs/amazoncorretto:11
   script:
     - ./gradlew markdownlint
   stage: build
@@ -180,14 +177,12 @@ Unit Tests:
   #   reports:
   #     junit: ${JUNIT_FILES}
   # coverage: '/Total.*?([0-9]{1,3})%/'
-  image: ${DEVOPS_REGISTRY}usgs/amazoncorretto:11
   script:
     - ./gradlew check
     # - cat ${JACOCO_HTML_DIR}/index.html
   stage: build
 
 YAML Lint:
-  image: ${DEVOPS_REGISTRY}usgs/amazoncorretto:11
   script:
     - ./gradlew yamllint
   stage: build
@@ -206,7 +201,6 @@ Trigger AWS Deployment:
     - *staging-env
     - *production-env
   script:
-    - apk add curl
     - |
       if [ "${ENVIRONMENT}" == 'production' ]; then
         REF="production";

Dockerfile

@@ -3,8 +3,8 @@
 #   docker build -t nshmp-ws-static .
 ####
 
-ARG BUILD_IMAGE=usgs/amazoncorretto:11
-ARG FROM_IMAGE=usgs/amazoncorretto:11
+ARG BUILD_IMAGE=code.usgs.gov:5001/devops/images/usgs/java:11
+ARG FROM_IMAGE=code.usgs.gov:5001/devops/images/usgs/java:11
 
 FROM ${BUILD_IMAGE} as builder
 
@@ -16,8 +16,12 @@ WORKDIR /app
 
 COPY . .
 
+USER root
+
 RUN ./gradlew assemble
 
+USER usgs-user
+
 ####
 # Run service
 ####