diff --git a/Dockerfile b/Dockerfile index 4a1a946441c1e5f1dfc47148212f5bd69326dba4..3e9442cf2f26d70b952c55eccea502d59a2df7ea 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,13 @@ -FROM tomcat -COPY build/draw.war /usr/local/tomcat/webapps +FROM frekele/ant:1.10.3-jdk8 as BUILD +RUN mkdir /usr/build +COPY src /usr/build/src +COPY etc /usr/build/etc +COPY war /usr/build/war +COPY VERSION /usr/build +RUN cd /usr/build/etc/build/ +RUN ant -file /usr/build/etc/build/build.xml war + +FROM tomcat:9.0 as TARGET +COPY --from=BUILD /usr/build/build/draw.war /usr/local/tomcat/webapps/ EXPOSE 8080 -CMD ["catalina.sh", "run"] +CMD ["catalina.sh", "run"] \ No newline at end of file diff --git a/README.md b/README.md index f3ade988dbe7fc5e92bc93f6c41114e770bd9b33..17cef39cc82409589d76c9c25c243ea6e9282c13 100644 --- a/README.md +++ b/README.md @@ -17,14 +17,6 @@ A development guide is being started on the GitHub project wiki. There is a [dra The [mxGraph documentation](https://jgraph.github.io/mxgraph/) provides a lot of the docs for the bottom part of the stack. There is an [mxgraph tag on SO](http://stackoverflow.com/questions/tagged/mxgraph). -Building --------- -From project directory, -```bash -cd etc/build/ -ant war -``` -This will create a war under build directory. Docker ------