Merge branch 'pipelines' into 'main'

Docker Images

See merge request !741

.gitlab-ci.yml

@@ -4,6 +4,8 @@ variables:
   NSHMP_HAZ_WS_IMAGE: ${CODE_REGISTRY_IMAGE}/nshmp-haz-ws:${ENVIRONMENT}-${CI_COMMIT_SHORT_SHA}
   REPORTS_DIR: build/reports
 
+image: ${CI_REGISTRY}/devops/images/usgs/java:11
+
 # Do not run for merge requests
 workflow:
   rules:
@@ -70,11 +72,12 @@ 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
 
@@ -142,22 +145,13 @@ default:
   variables:
     DOCKERFILE: Dockerfile
     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
     IMAGE_TAG: ${ENVIRONMENT}-${CI_COMMIT_SHORT_SHA}
     PUSH_DOCKER: 'false'
     REGISTRY_IMAGE: ${CI_REGISTRY_IMAGE}
     TAG: build
 
-####
-# Java Templates
-####
-
-##
-# General Java setup
-##
-.java:
-  image: ${DEVOPS_REGISTRY}usgs/amazoncorretto:11
 
 ####
 # Stage: build
@@ -180,8 +174,8 @@ CHS Registry:
         TAG: 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_PROJECT_URL=${CI_PROJECT_URL}
     PUSH_DOCKER: 'true'
@@ -206,15 +200,13 @@ Container Registry:
         TAG: nshmp
   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_PROJECT_URL=${CI_PROJECT_URL}
     UPSTREAM_PATH: ghsc/nshmp/nshmp-haz
 
 Build Project:
-  extends:
-    - .java
   script:
     - ./gradlew assemble
   stage: build
@@ -225,8 +217,6 @@ Build Project:
 
 Markdown Lint:
   allow_failure: true
-  extends:
-    - .java
   needs: []
   script:
     - ./gradlew nodeInstall
@@ -240,8 +230,6 @@ NSHM Tests:
     reports:
       junit: ${JUNIT_FILES}
   coverage: '/Total.*?([0-9]{1,3})%/'
-  extends:
-    - .java
   needs: []
   parallel:
     matrix:
@@ -257,8 +245,6 @@ NSHM Tests:
 
 YAML Lint:
   allow_failure: true
-  extends:
-    - .java
   needs: []
   script:
     - ./gradlew nodeInstall
@@ -272,8 +258,6 @@ Unit Tests:
     reports:
       junit: ${JUNIT_FILES}
   coverage: '/Total.*?([0-9]{1,3})%/'
-  extends:
-    - .java
   needs: []
   script:
     - ./gradlew check
@@ -292,7 +276,6 @@ Trigger nshmp-haz-ws CDK:
     - *staging-env
     - *production-env
   script:
-    - apk add curl
     - |
       if [ "${ENVIRONMENT}" == 'production' ]; then
         REF="production";

Dockerfile

@@ -19,6 +19,7 @@
 #
 #   docker run \
 #       --env CLASS_NAME="nshmp-haz class name" \
+#       --volume "/path/to/sites:/app/sites.geojson" \
 #       --volume "/path/to/model:/app/model" \
 #       --volume "/path/to/output:/app/output" \
 #       usgs/nshmp-haz:production-latest
@@ -27,8 +28,8 @@
 #   docker build -t nshmp-haz .
 ####
 
-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
 
 ####
 # Builder image: Build jar file.
@@ -43,6 +44,8 @@ WORKDIR /app
 
 COPY . .
 
+USER root
+
 RUN ./gradlew assemble
 
 ####
@@ -66,10 +69,16 @@ VOLUME [ "${MODEL_PATH}", "${OUTPUT_PATH}" ]
 
 WORKDIR /app
 
-COPY --from=builder /app/build/libs/nshmp-haz.jar .
-COPY scripts scripts
+USER root
+
+RUN yum install -y jq && \
+    chown -R usgs-user:usgs-user /app
+
+USER usgs-user
+
+COPY --from=builder --chown=usgs-user:usgs-user /app/build/libs/nshmp-haz.jar .
+COPY --chown=usgs-user:usgs-user scripts scripts
 
-RUN yum install -y jq \
-    && echo "{}" > "${CONFIG_FILE}"
+RUN echo "{}" > "${CONFIG_FILE}"
 
 ENTRYPOINT [ "bash", "scripts/docker-entrypoint.sh" ]

docs/pages/Using-Docker.md

@@ -84,7 +84,7 @@ docker pull usgs/nshmp-haz:latest
 docker run \
     --env CLASS_NAME="HazardCalc" \
     --volume "$(pwd)/nshm-hawaii:/app/model" \
-    --volume "$(pwd)/sites.geojson" \
+    --volume "$(pwd)/sites.geojson:/app/sites.geojson" \
     --volume "$(pwd)/hawaii-hazard-output:/app/output" \
     usgs/nshmp-haz
 ```
@@ -107,7 +107,7 @@ docker run \
     --env CLASS_NAME="DisaggCalc" \
     --env RETURN_PERIOD=475 \
     --volume "$(pwd)/nshm-hawaii:/app/model" \
-    --volume "$(pwd)/sites.geojson" \
+    --volume "$(pwd)/sites.geojson:/app/sites.geojson" \
     --volume "$(pwd)/hawaii-disagg-output:/app/output" \
     usgs/nshmp-haz:latest
 ```
@@ -129,7 +129,7 @@ docker pull usgs/nshmp-haz:latest
 docker run \
     --env CLASS_NAME="RateCalc" \
     --volume "$(pwd)/nshm-hawaii:/app/model" \
-    --volume "$(pwd)/sites.geojson" \
+    --volume "$(pwd)/sites.geojson:/app/sites.geojson" \
     --volume "$(pwd)/hawaii-rate-output:/app/output" \
     usgs/nshmp-haz
 ```

ws.Dockerfile

@@ -13,12 +13,12 @@
 #
 # Run locally:
 #   docker run -p 8080:8080
-#       -v "path/to/models:/models"
+#       -v "path/to/model:/app/model"
 #       nshmp-haz-ws
 ####
 
-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
 
 ####
 # Builder image: Build jar file.
@@ -35,6 +35,8 @@ WORKDIR /app
 
 COPY . .
 
+USER root
+
 RUN ./gradlew assemble
 
 ####
@@ -46,12 +48,20 @@ LABEL maintainer="Peter Powers <pmpowers@usgs.gov>, Brandon Clayton <bclayton@us
 
 ENV CONTEXT_PATH="/"
 ENV JAVA_OPTS="-Xms2g -Xmx8g"
-ENV MODELS_DIRECTORY="/model"
+ENV MODELS_DIRECTORY="/app/model"
 
 WORKDIR /app
 
-COPY --from=builder /app/build/libs/nshmp-haz.jar .
-COPY --from=builder /app/nshms.yml .
+USER root
+
+RUN mkdir /asset-output  \
+    && chown -R usgs-user:usgs-user /app \
+    && chown -R usgs-user:usgs-user /asset-output
+
+USER usgs-user
+
+COPY --from=builder --chown=usgs-user:usgs-user /app/build/libs/nshmp-haz.jar .
+COPY --from=builder --chown=usgs-user:usgs-user /app/nshms.yml .
 
 VOLUME [ "${MODELS_DIRECTORY}" ]