Skip to content

Commit f93b10d

Browse files
committed
new changes
1 parent 90c41c6 commit f93b10d

File tree

2 files changed

+16
-22
lines changed

2 files changed

+16
-22
lines changed

Dockerfile

+16-18
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,28 @@
1-
FROM java:8
1+
FROM java:8 AS BUILD
2+
ENV APP_HOME=/root/code/
3+
RUN rm -rf $APP_HOME
4+
RUN mkdir -p $APP_HOME
5+
WORKDIR $APP_HOME
6+
7+
# Prepare by downloading dependencies
8+
ADD pom.xml $APP_HOME/pom.xml
9+
10+
# Adding source, compile and package into a fat jar
11+
ADD src $APP_HOME/src
212

313
# Install maven
414
RUN apt-get update
515
RUN apt-get install -y maven
616

7-
WORKDIR /code
8-
9-
# Prepare by downloading dependencies
10-
ADD pom.xml /code/pom.xml
11-
12-
# Adding source, compile and package into a fat jar
13-
ADD src /code/src
1417
RUN ["mvn", "dependency:resolve"]
1518
RUN ["mvn", "verify"]
1619
RUN ["mvn", "clean"]
1720
RUN ["mvn", "package"]
1821

19-
WORKDIR /code
20-
21-
RUN curl -O http://archive.apache.org/dist/tomcat/tomcat-8/v8.5.9/bin/apache-tomcat-8.5.9.tar.gz
22-
RUN tar xzf apache-tomcat-8.5.9.tar.gz
23-
24-
WORKDIR /code
25-
26-
COPY /code/src/main/webapp/index.jsp apache-tomcat-8.5.9/webapps/
27-
22+
FROM tomcat:8.0.20-jre8
23+
# WORKDIR /root/
2824
EXPOSE 8080
2925

30-
CMD apache-tomcat-8.5.9/bin/startup.sh && tail -f apache-tomcat-8.5.9/logs/catalina.out
26+
COPY --from=BUILD /root/code/target/*.war /usr/local/tomcat/webapps/simplewebapp.war
27+
28+
CMD /usr/local/tomcat/bin/startup.sh && tail -f /usr/local/tomcat/logs/catalina.out

pom.xml

-4
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,6 @@
2424
<plugin>
2525
<artifactId>maven-war-plugin</artifactId>
2626
<version>2.6</version>
27-
<configuration>
28-
<failOnMissingWebXml>false</failOnMissingWebXml>
29-
<warName>simplewebapp</warName>
30-
</configuration>
3127
</plugin>
3228
</plugins>
3329
</build>

0 commit comments

Comments
 (0)