diff --git a/pom.xml b/pom.xml index 7d17329..a8fbe9b 100644 --- a/pom.xml +++ b/pom.xml @@ -56,15 +56,17 @@ org.eclipse.jkube kubernetes-maven-plugin - 1.19.0 + 1.19.0 ${image.name}:${image.tag} ${image.registry} + + ${project.build.directory}/resources + - ${project.build.directory}/resources docker true diff --git a/Dockerfile b/src/main/docker/Dockerfile similarity index 87% rename from Dockerfile rename to src/main/docker/Dockerfile index 4dc9feb..2ac44dc 100644 --- a/Dockerfile +++ b/src/main/docker/Dockerfile @@ -28,14 +28,14 @@ RUN cd /var/lib/tomcat/dev && \ mkdir web web-extra1 web-extra2 web-extra3 web-extra4 web-extra5 web-extra6 web-extra7 # Add our Docker container initialization script -ADD maven/target/resources/setenv.sh /usr/local/bin/${namespace.prefix}-setenv.sh -COPY maven/target/resources/docker-entrypoint.sh /usr/local/bin +ADD maven/setenv.sh /usr/local/bin/${namespace.prefix}-setenv.sh +COPY maven/docker-entrypoint.sh /usr/local/bin RUN chmod 755 /usr/local/bin/docker-entrypoint.sh # Add our Apache Tomcat configuration # This gives us dynamic injection points into the running webapps -COPY maven/target/resources/tomcat-context.xml /var/lib/tomcat/conf/context.xml -ADD maven/target/resources/hotswap-agent.properties /var/lib/tomcat/lib +COPY maven/tomcat-context.xml /var/lib/tomcat/conf/context.xml +ADD maven/hotswap-agent.properties /var/lib/tomcat/lib # Listening for HTTP (not HTTPS) traffic EXPOSE 8080