[ci fw-only Java/gemini Java/servlet3] gemini, servlet3: remove TE deps (#3536)

frameworks/Java/gemini/gemini-mysql.dockerfile

@@ -1,20 +1,19 @@
-FROM techempower/ant:0.1 as ant
+FROM openjdk:9-jdk-slim as ant
+RUN apt update -qqy && apt install -qqy ant
 
-RUN apt-get install -qqy -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" \
-    ant
+WORKDIR /gemini
+COPY Docroot Docroot
+COPY Source Source
+COPY build.xml build.xml
+COPY ivy.xml ivy.xml
+COPY ivysettings.xml ivysettings.xml
 
-ADD Docroot/ /gemini/Docroot
-ADD Source/ /gemini/Source
-ADD build.xml /gemini/
-ADD ivy.xml /gemini/
-ADD ivysettings.xml /gemini/
-
-RUN cd /gemini/Docroot/WEB-INF; mv gemini-mysql.conf GeminiHello.conf;
-
-RUN cd /gemini; mkdir -p Docroot/WEB-INF/classes; mkdir -p Docroot/WEB-INF/lib; ant resolve; ant compile
+RUN mv Docroot/WEB-INF/gemini-mysql.conf Docroot/WEB-INF/GeminiHello.conf
+RUN mkdir Docroot/WEB-INF/classes
+RUN mkdir Docroot/WEB-INF/lib
+RUN ant resolve
+RUN ant compile
 
 FROM techempower/resin:0.1
-
 COPY --from=ant /gemini /gemini
-
-CMD java -jar ${RESIN_HOME}/lib/resin.jar -conf /gemini/Docroot/WEB-INF/resin.xml console
+CMD java -jar ${RESIN_HOME}/lib/resin.jar -conf /gemini/Docroot/WEB-INF/resin.xml console

frameworks/Java/gemini/gemini-postgres.dockerfile

@@ -1,20 +1,19 @@
-FROM techempower/ant:0.1 as ant
+FROM openjdk:9-jdk-slim as ant
+RUN apt update -qqy && apt install -qqy ant
 
-RUN apt-get install -qqy -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" \
-    ant
+WORKDIR /gemini
+COPY Docroot Docroot
+COPY Source Source
+COPY build.xml build.xml
+COPY ivy.xml ivy.xml
+COPY ivysettings.xml ivysettings.xml
 
-ADD Docroot/ /gemini/Docroot
-ADD Source/ /gemini/Source
-ADD build.xml /gemini/
-ADD ivy.xml /gemini/
-ADD ivysettings.xml /gemini/
-
-RUN cd /gemini/Docroot/WEB-INF; mv gemini-postgres.conf GeminiHello.conf;
-
-RUN cd /gemini; mkdir -p Docroot/WEB-INF/classes; mkdir -p Docroot/WEB-INF/lib; ant resolve; ant compile
+RUN mv Docroot/WEB-INF/gemini-postgres.conf Docroot/WEB-INF/GeminiHello.conf
+RUN mkdir Docroot/WEB-INF/classes
+RUN mkdir Docroot/WEB-INF/lib
+RUN ant resolve
+RUN ant compile
 
 FROM techempower/resin:0.1
-
 COPY --from=ant /gemini /gemini
-
-CMD java -jar ${RESIN_HOME}/lib/resin.jar -conf /gemini/Docroot/WEB-INF/resin.xml console
+CMD java -jar ${RESIN_HOME}/lib/resin.jar -conf /gemini/Docroot/WEB-INF/resin.xml console

frameworks/Java/gemini/gemini.dockerfile

@@ -1,17 +1,19 @@
-FROM techempower/ant:0.1 as ant
+FROM openjdk:9-jdk-slim as ant
+RUN apt update -qqy && apt install -qqy ant
 
-ADD Docroot/ /gemini/Docroot
-ADD Source/ /gemini/Source
-ADD build.xml /gemini/
-ADD ivy.xml /gemini/
-ADD ivysettings.xml /gemini/
+WORKDIR /gemini
+COPY Docroot Docroot
+COPY Source Source
+COPY build.xml build.xml
+COPY ivy.xml ivy.xml
+COPY ivysettings.xml ivysettings.xml
 
-RUN cd /gemini/Docroot/WEB-INF; mv gemini.conf GeminiHello.conf;
-
-RUN cd /gemini; mkdir -p Docroot/WEB-INF/classes; mkdir -p Docroot/WEB-INF/lib; ant resolve; ant compile
+RUN mv Docroot/WEB-INF/gemini.conf Docroot/WEB-INF/GeminiHello.conf
+RUN mkdir Docroot/WEB-INF/classes
+RUN mkdir Docroot/WEB-INF/lib
+RUN ant resolve
+RUN ant compile
 
 FROM techempower/resin:0.1
-
 COPY --from=ant /gemini /gemini
-
-CMD java -jar ${RESIN_HOME}/lib/resin.jar -conf /gemini/Docroot/WEB-INF/resin.xml console
+CMD java -jar ${RESIN_HOME}/lib/resin.jar -conf /gemini/Docroot/WEB-INF/resin.xml console

frameworks/Java/servlet3/servlet3-sync.dockerfile

@@ -4,7 +4,9 @@ COPY src src
 COPY pom.xml pom.xml
 RUN mvn compile war:war -q -P sync
 
-FROM techempower/tomcat:0.1
+FROM tomcat:9.0.6-jre9-slim
+WORKDIR /servlet3
+RUN rm -rf ${CATALINA_HOME}/webapps/*
 COPY --from=maven /servlet3/target/servlet3.war ${CATALINA_HOME}/webapps/ROOT.war
 COPY server.xml ${CATALINA_HOME}/conf/server.xml
 CMD bash ${CATALINA_HOME}/bin/catalina.sh run

frameworks/Java/servlet3/servlet3.dockerfile

@@ -4,7 +4,9 @@ COPY src src
 COPY pom.xml pom.xml
 RUN mvn compile war:war -q
 
-FROM techempower/tomcat:0.1
+FROM tomcat:9.0.6-jre9-slim
+WORKDIR /servlet3
+RUN rm -rf ${CATALINA_HOME}/webapps/*
 COPY --from=maven /servlet3/target/servlet3.war ${CATALINA_HOME}/webapps/ROOT.war
 COPY server.xml ${CATALINA_HOME}/conf/server.xml
 CMD bash ${CATALINA_HOME}/bin/catalina.sh run