gameoflife.war must run standalone

rshiva777 · Sep 18, 2016 · d61593f · d61593f
1 parent 6ebd401
commit d61593f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -13,15 +13,6 @@ RUN wget -O- http://archive.apache.org/dist/maven/maven-3/$MAVEN_VERSION/binarie
   && mv /opt/apache-maven-$MAVEN_VERSION /opt/maven \
   && ln -s /opt/maven/bin/mvn /usr/bin/mvn
 
-RUN mkdir /home/seluser/gameoflife-acceptance-tests \
-  && mkdir /home/seluser/gameoflife-web
-COPY /gameoflife-acceptance-tests /home/seluser/gameoflife-acceptance-tests
-COPY /gameoflife-web /home/seluser/gameoflife-web
-RUN chown -R seluser /home/seluser/gameoflife-acceptance-tests \
-  && chmod -R u+rX /home/seluser/gameoflife-acceptance-tests \
-  && chown -R seluser /home/seluser/gameoflife-web \
-  && chmod -R u+rX /home/seluser/gameoflife-web
-
 USER seluser
 
 ENV MAVEN_HOME /opt/maven

diff --git a/gameoflife-web/Dockerfile b/gameoflife-web/Dockerfile
@@ -0,0 +1,8 @@
+FROM tomcat:8-jre8
+
+RUN rm -rf /usr/local/tomcat/webapps/*
+
+COPY target/gameoflife.war /usr/local/tomcat/webapps/ROOT.war
+
+EXPOSE 8080
+CMD ["catalina.sh", "run"]