Refactoring

jenkins-jdk7-maven-ant/Dockerfile

@@ -1,56 +1,86 @@
-#########
-# Jenkins
-#########
-
-FROM jenkins:1.609.1
+FROM debian:jessie
 
 USER root
+RUN apt-get update
+RUN apt-get install -y wget
 
 ############
 # Oracle JDK
 ############
 
-ENV VERSION 7u80
-ENV BUILD 15
-ENV JAVA_HOME /etc/jdk-${VERSION}-b${BUILD}
+# Preparation
 
-RUN cd /tmp
-RUN wget --no-check-certificate --no-cookies --header "Cookie: oraclelicense=accept-securebackup-cookie" http://download.oracle.com/otn-pub/java/jdk/${VERSION}-b${BUILD}/jdk-${VERSION}-linux-x64.tar.gz
-RUN mkdir jdk-${VERSION}-linux-x64
-RUN tar -zxvf jdk-${VERSION}-linux-x64.tar.gz --directory jdk-${VERSION}-linux-x64 --strip-components=1
-RUN mv jdk-${VERSION}-linux-x64 ${JAVA_HOME}
+ENV JAVA_VERSION 8u45
+ENV JAVA_BUILD 14
+ENV JAVA_HOME /etc/jdk-${JAVA_VERSION}-b${JAVA_BUILD}
 
+# Installation
+
+RUN cd /tmp
+RUN wget --no-check-certificate --no-cookies --header "Cookie: oraclelicense=accept-securebackup-cookie" http://download.oracle.com/otn-pub/java/jdk/${JAVA_VERSION}-b${JAVA_BUILD}/jdk-${JAVA_VERSION}-linux-x64.tar.gz
+RUN mkdir jdk-${JAVA_VERSION}-linux-x64
+RUN tar -zxvf jdk-${JAVA_VERSION}-linux-x64.tar.gz --directory jdk-${JAVA_VERSION}-linux-x64 --strip-components=1
+RUN mv jdk-${JAVA_VERSION}-linux-x64 ${JAVA_HOME}
 ENV PATH ${PATH}:${JAVA_HOME}/bin
 
-# Testing
-RUN java -version
-RUN javac -version
+# Cleanup
+
+RUN rm jdk-${JAVA_VERSION}-linux-x64.tar.gz
+RUN unset JAVA_VERSION
 
 #######
 # Maven
 #######
 
+# Preparation
+
 ENV MAVEN_VERSION 3.2.3
-ENV MAVEN_HOME /opt/maven
+ENV MAVEN_HOME /etc/maven-${MAVEN_VERSION}
 
-RUN curl -sSL http://archive.apache.org/dist/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-$MAVEN_VERSION-bin.tar.gz | tar xzf - -C /tmp
-RUN mv /tmp/apache-maven-${MAVEN_VERSION} ${MAVEN_HOME}
+# Installation
 
+RUN cd /tmp
+RUN wget http://archive.apache.org/dist/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz
+RUN mkdir maven-${MAVEN_VERSION}
+RUN tar -zxvf apache-maven-${MAVEN_VERSION}-bin.tar.gz --directory maven-${MAVEN_VERSION} --strip-components=1
+RUN mv maven-${MAVEN_VERSION} ${MAVEN_HOME}
 ENV PATH ${PATH}:${MAVEN_HOME}/bin
-RUN mvn -version
+
+# Cleanup
+
+RUN rm apache-maven-${MAVEN_VERSION}-bin.tar.gz
+RUN unset MAVEN_VERSION
 
 #####
 # Ant
 #####
 
+# Preparation
+
 ENV ANT_VERSION 1.9.5
-ENV ANT_HOME /opt/ant
+ENV ANT_HOME /etc/ant-${ANT_VERSION}
+
+# Installation
 
 RUN cd /tmp
-RUN wget -q http://www.us.apache.org/dist/ant/binaries/apache-ant-${ANT_VERSION}-bin.tar.gz
-RUN tar -xzf apache-ant-${ANT_VERSION}-bin.tar.gz
-RUN mv apache-ant-${ANT_VERSION} ${ANT_HOME}
+RUN wget http://www.us.apache.org/dist/ant/binaries/apache-ant-${ANT_VERSION}-bin.tar.gz
+RUN mkdir ant-${ANT_VERSION}
+RUN tar -zxvf apache-ant-${ANT_VERSION}-bin.tar.gz --directory ant-${ANT_VERSION} --strip-components=1
+RUN mv ant-${ANT_VERSION} ${ANT_HOME}
+ENV PATH ${PATH}:${ANT_HOME}/bin
+
+# Cleanup
+
 RUN rm apache-ant-${ANT_VERSION}-bin.tar.gz
+RUN unset ANT_VERSION
 
-ENV PATH ${PATH}:${ANT_HOME}/bin
+#########
+# Testing
+#########
+
+RUN env
+RUN java -version
+RUN javac -version
+RUN mvn -version
 RUN ant -version
+