Merge pull request #8 from tramasoli-docker/issue-5

Closes #1 , Closes #2

.travis.yml

@@ -10,18 +10,10 @@ env:
   matrix:
     - DOCKERFILE=centos-docker-client/7
     - DOCKERFILE=centos-angular-cli/7
-    #- DOCKERFILE=centos-jenkins-jdk-7.80/7
-    #- DOCKERFILE=centos-jenkins-jdk-8.102/7
-    #- DOCKERFILE=centos-jenkins-jdk-8.111/7
-    - DOCKERFILE=centos-jenkins-jdk-8.121/7
-    #- DOCKERFILE=centos-jenkins-jdk-8.92/7
+    - DOCKERFILE=centos-jenkins-jdk-8/7
     - DOCKERFILE=centos-ssh/7
     #- DOCKERFILE=oraclelinux-angular-cli/7
-    #- DOCKERFILE=oraclelinux-jenkins-jdk-7.80/7
-    #- DOCKERFILE=oraclelinux-jenkins-jdk-8.102/7
-    #- DOCKERFILE=oraclelinux-jenkins-jdk-8.111/7
-    - DOCKERFILE=oraclelinux-jenkins-jdk-8.121/7
-    #- DOCKERFILE=oraclelinux-jenkins-jdk-8.92/7
+    - DOCKERFILE=oraclelinux-jenkins-jdk-8/7
     - DOCKERFILE=oraclelinux-ssh/7
 
 services:

centos-jenkins-jdk-8.111/7/Dockerfile → centos-jenkins-jdk-8/7/Dockerfile

@@ -4,7 +4,9 @@ LABEL env=dev
 RUN yum -y install openssh-server shadow-utils
 COPY ./scripts/Dockerfile-jenkins.bootstrap /bootstrap.sh
 ENV JAVA_HOME=/opt/jdk     M2_HOME=/opt/maven     PATH=${PATH}:/opt/jdk/bin:/opt/maven/bin
+ENV JDK_URL=http://download.oracle.com/otn-pub/java/jdk/8u131-b11/d54c1d3a095b4ff2b6607d096fa80163/jdk-8u131-linux-x64.tar.gz
+ENV JDK_VERSION=1.8.0_131
 # installs Subversion, Git, Maven, JDK
-RUN echo -e "JAVA_HOME=${JAVA_HOME}\nM2_HOME=${M2_HOME}\nPATH=${PATH}\n" > /etc/environment &&     yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-$(cat /etc/redhat-release | grep -oP "[0-9]*\.[0-9]*" | cut -d"." -f1).noarch.rpm &&     yum install -y subversion git tar xmlstarlet &&     curl http://www-eu.apache.org/dist/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz         -o /tmp/maven.tar.gz &&     gunzip /tmp/maven.tar.gz &&     tar -C /opt -xf /tmp/maven.tar &&     ln -s /opt/apache-maven-3.3.9 /opt/maven &&     curl -jksSLH "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/java.tar.gz http://download.oracle.com/otn-pub/java/jdk/8u111-b14/jdk-8u111-linux-x64.tar.gz &&     gunzip /tmp/java.tar.gz &&     tar -C /opt -xf /tmp/java.tar &&     ln -s /opt/jdk1.8.0_111 /opt/jdk &&     sed -i s/#networkaddress.cache.ttl=-1/networkaddress.cache.ttl=0/ $JAVA_HOME/jre/lib/security/java.security &&     yum clean all &&     rm -rf /tmp/*
+RUN echo -e "JAVA_HOME=${JAVA_HOME}\nM2_HOME=${M2_HOME}\nPATH=${PATH}\n" > /etc/environment &&     yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-$(cat /etc/redhat-release | grep -oP "[0-9]*\.[0-9]*" | cut -d"." -f1).noarch.rpm &&     yum install -y subversion git tar xmlstarlet &&     curl http://www-eu.apache.org/dist/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz         -o /tmp/maven.tar.gz &&     gunzip /tmp/maven.tar.gz &&     tar -C /opt -xf /tmp/maven.tar &&     ln -s /opt/apache-maven-3.3.9 /opt/maven &&     curl -jksSLH "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/java.tar.gz ${JDK_URL} &&     gunzip /tmp/java.tar.gz &&     tar -C /opt -xf /tmp/java.tar &&     ln -s /opt/jdk${JDK_VERSION} /opt/jdk &&     sed -i s/#networkaddress.cache.ttl=-1/networkaddress.cache.ttl=0/ $JAVA_HOME/jre/lib/security/java.security &&     yum clean all &&     rm -rf /tmp/*
 EXPOSE 22
 CMD ["/bin/bash","/bootstrap.sh"]