Merge branch 'master' into more_properties

This commit is contained in:
Sean McIlvenna
2019-02-11 16:42:49 -08:00
2 changed files with 2 additions and 1 deletions

1
.gitignore vendored
View File

@@ -1,5 +1,6 @@
target/ target/
.idea/ .idea/
*.iml
# Compiled class file # Compiled class file
*.class *.class

View File

@@ -1,4 +1,4 @@
FROM jetty:9-jre8-alpine FROM jetty:9-jre8-alpine
USER jetty:jetty USER jetty:jetty
ADD ./target/hapi-fhir-jpaserver-starter.war /var/lib/jetty/webapps/root.war ADD ./target/hapi-fhir-jpaserver.war /var/lib/jetty/webapps/root.war
EXPOSE 8080 EXPOSE 8080