Skip to content
Snippets Groups Projects
Commit 87560b3a authored by Clayton, Brandon Scott's avatar Clayton, Brandon Scott
Browse files

cleanup

parent 5d29a728
No related branches found
No related tags found
1 merge request!216Landing Page
Hide whitespace changes
Inline Side-by-side
Showing
with 14 additions and 6 deletions
Dockerfile
+ 14
− 6
View file @ 87560b3a
...@@ -20,10 +20,10 @@ ARG CI_COMMIT_BRANCH=null ...@@ -20,10 +20,10 @@ ARG CI_COMMIT_BRANCH=null
WORKDIR /app WORKDIR /app
COPY . .
USER root USER root
COPY . .
RUN ./gradlew assemble RUN ./gradlew assemble
#### ####
...@@ -31,17 +31,25 @@ RUN ./gradlew assemble ...@@ -31,17 +31,25 @@ RUN ./gradlew assemble
#### ####
FROM ${FROM_IMAGE} FROM ${FROM_IMAGE}
ENV CONTEXT_PATH "/" ENV CONTEXT_PATH="/"
ENV JAVA_OPTS="" ENV JAVA_OPTS=""
WORKDIR /app WORKDIR /app
COPY --from=builder /app/build/libs/nshmp-ws-all.jar . USER root
COPY --from=builder /app/fault-sections /app/fault-sections
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-ws-all.jar .
COPY --from=builder --chown=usgs-user:usgs-user /app/fault-sections /app/fault-sections
EXPOSE 8080 EXPOSE 8080
CMD /usr/bin/java \ CMD java \
${JAVA_OPTS} \ ${JAVA_OPTS} \
-jar \ -jar \
"-Dmicronaut.server.context-path=${CONTEXT_PATH}" \ "-Dmicronaut.server.context-path=${CONTEXT_PATH}" \
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment