diff --git a/Dockerfile b/Dockerfile index 6e0c8c43211e4f533bbc4a4f5d73f0acad640ea7..c363c429a6856e6d6ff3c2239f0c9686950b6ad4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,12 +10,9 @@ ARG FROM_IMAGE=usgs/amazoncorretto:11 FROM ${BUILD_IMAGE} as builder -ARG gitlab_token=null -ARG ci_job_token=null - # TODO: Token needed until nshmp-lib is public -ENV GITLAB_TOKEN ${gitlab_token} -ENV CI_JOB_TOKEN ${ci_job_token} +ARG GITLAB_TOKEN=null +ARG CI_JOB_TOKEN=null WORKDIR /app @@ -28,20 +25,27 @@ RUN ./gradlew assemble #### FROM ${FROM_IMAGE} -# Path to the NetCDF file to use -ENV NETCDF_FILE hazard-example.nc +# Which service to run: hazard or aashto +ENV SERVICE="hazard" +# Web service context path ENV CONTEXT_PATH "/" ENV JAVA_OPTS="" +# Path to the NetCDF file to use +ENV NETCDF_FILE ${SERVICE}-example.nc + WORKDIR /app -COPY --from=builder /app/build/libs/nshmp-ws-static-all.jar nshmp-ws-static.jar -COPY --from=builder /app/src/main/resources/hazard-example.nc . +COPY --from=builder /app/src/aashto/build/libs/aashto-all.jar aashto.jar +COPY --from=builder /app/src/aashto/src/main/resources/aashto-example.nc . + +COPY --from=builder /app/src/hazard/build/libs/hazard-all.jar hazard.jar +COPY --from=builder /app/src/hazard/src/main/resources/hazard-example.nc . ENTRYPOINT /usr/bin/java \ ${JAVA_OPTS} \ -jar \ - nshmp-ws-static.jar \ + "${SERVICE}".jar \ "-Dmicronaut.server.context-path=${CONTEXT_PATH}" \ -netcdf=${NETCDF_FILE}