You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2019/12/12 15:12:43 UTC
[jspwiki] branch master updated: Use working maven base image to
build JSPWiki war
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
The following commit(s) were added to refs/heads/master by this push:
new 7fc1ed8 Use working maven base image to build JSPWiki war
7fc1ed8 is described below
commit 7fc1ed82599dfd43d90bf55aad6517a73e0a0391
Author: Juan Pablo Santos RodrÃguez <ju...@apache.org>
AuthorDate: Thu Dec 12 16:12:34 2019 +0100
Use working maven base image to build JSPWiki war
also, use /tmp as working dir, makes more sense than /opt
---
Dockerfile | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index ef6d7db..06555da 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,9 +15,9 @@
# specific language governing permissions and limitations
# under the License.
-FROM maven:3.6.2-jdk-8-alpine as package
+FROM maven:3.6-jdk-8 as package
-WORKDIR /opt
+WORKDIR /tmp
COPY . .
@@ -27,8 +27,8 @@ RUN set -x \
FROM tomcat:8.5
-COPY --from=package /opt/jspwiki-war/target/JSPWiki.war /tmp
-COPY --from=package /opt/jspwiki-wikipages/en/target/jspwiki-wikipages-en-*.zip /tmp
+COPY --from=package /tmp/jspwiki-war/target/JSPWiki.war /tmp
+COPY --from=package /tmp/jspwiki-wikipages/en/target/jspwiki-wikipages-en-*.zip /tmp
COPY docker-files/log4j.properties /tmp
COPY docker-files/tomcat-users.xml $CATALINA_HOME/conf/tomcat-users.xml
@@ -81,4 +81,4 @@ EXPOSE 8080
#
# by default we start the Tomcat container when the docker container is started.
-CMD ["/usr/local/tomcat/bin/catalina.sh","run", ">/usr/local/tomcat/logs/catalina.out"]
\ No newline at end of file
+CMD ["/usr/local/tomcat/bin/catalina.sh","run", ">/usr/local/tomcat/logs/catalina.out"]