cleanup

Dockerfile

@@ -19,8 +19,9 @@
 #
 #   docker run \
 #       --env CLASS_NAME="nshmp-haz class name" \
-#       --volume "/path/to/model:/model" \
-#       --volume "/path/to/output:/output" \
+#       --volume "/path/to/sites:/app/sites.geojson" \
+#       --volume "/path/to/model:/app/model" \
+#       --volume "/path/to/output:/app/output" \
 #       usgs/nshmp-haz:production-latest
 #
 # Build locally:
@@ -44,8 +45,8 @@ WORKDIR /app
 COPY . .
 
 USER root
+
 RUN ./gradlew assemble
-USER usgs-user
 
 ####
 # Application image: Run jar file.
@@ -72,9 +73,8 @@ COPY --from=builder /app/build/libs/nshmp-haz.jar .
 COPY scripts scripts
 
 USER root
-RUN yum install -y jq
-USER usgs-user
 
-RUN echo "{}" > "${CONFIG_FILE}"
+RUN yum install -y jq \
+    && 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,7 +13,7 @@
 #
 # Run locally:
 #   docker run -p 8080:8080
-#       -v "path/to/model:/model"
+#       -v "path/to/model:/app/model"
 #       nshmp-haz-ws
 ####
 
@@ -36,8 +36,8 @@ WORKDIR /app
 COPY . .
 
 USER root
+
 RUN ./gradlew assemble
-USER usgs-user
 
 ####
 # Application image: Run jar file.
@@ -48,7 +48,7 @@ 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