diff --git a/.gitignore b/.gitignore index 46d0247f5..c85a385d5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ target/* petclinic-application/target/* -/petclinic-containers/src/main/resources/petclinic.jar +petclinic-container/target/context/petclinic.jar .settings/* .classpath .editorconfig diff --git a/petclinic-application/pom.xml b/petclinic-application/pom.xml index 5c0d21330..eca4a88b6 100644 --- a/petclinic-application/pom.xml +++ b/petclinic-application/pom.xml @@ -206,5 +206,4 @@ - diff --git a/petclinic-container/pom.xml b/petclinic-container/pom.xml index 5f37a34d3..21d45f5bc 100644 --- a/petclinic-container/pom.xml +++ b/petclinic-container/pom.xml @@ -25,6 +25,29 @@ + + maven-resources-plugin + ${resources-plugin.version} + + + copy-resources + + validate + + copy-resources + + + ${basedir}/target/context/ + + + ${basedir}/src/main/resources + true + + + + + + org.apache.maven.plugins maven-dependency-plugin @@ -43,7 +66,7 @@ ${project.version} jar true - ${basedir}/src/main/resources + ${basedir}/target/context/ petclinic.jar @@ -64,7 +87,7 @@ docker - ${project.basedir}/src/main/resources + ${project.basedir}/target/context/ build . @@ -80,3 +103,7 @@ + + diff --git a/petclinic-container/src/main/resources/petclinic.jar b/petclinic-container/src/main/resources/petclinic.jar deleted file mode 100644 index 5b64db9c6..000000000 Binary files a/petclinic-container/src/main/resources/petclinic.jar and /dev/null differ diff --git a/petclinic-container/target/context/dockerfile b/petclinic-container/target/context/dockerfile new file mode 100644 index 000000000..9c48f6cde --- /dev/null +++ b/petclinic-container/target/context/dockerfile @@ -0,0 +1,4 @@ +FROM java:8 +EXPOSE 8080 +COPY petclinic.jar / +CMD ["java", "-jar", "petclinic.jar"] diff --git a/pom.xml b/pom.xml index 10823ae1e..0e2f75c87 100644 --- a/pom.xml +++ b/pom.xml @@ -45,6 +45,7 @@ 2.8.1 1.6.0 + 3.1.0