Merge branch '1.4.x' into 1.5.x

pull/9258/merge
Andy Wilkinson 8 years ago
commit 3cf8e81a8b

@ -1,12 +0,0 @@
# CentOS 5.11 from 30/08/2016
FROM centos@sha256:f5ac6bb54c5042387c79c83fca93eff7b721da54ab995fd64a20b23f6785465d
RUN yum install -y wget && \
yum install -y system-config-services && \
yum install -y curl && \
wget --no-cookies \
--no-check-certificate \
--header "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie" \
--output-document jdk.rpm \
http://download.oracle.com/otn-pub/java/jdk/8u66-b17/jdk-8u66-linux-x64.rpm && \
yum --nogpg localinstall -y jdk.rpm && \
rm -f jdk.rpm

@ -1,12 +0,0 @@
# CentOS 6.8 from 30/08/2016
FROM centos@sha256:699d6ab3b404f286b5f5e88415e05668b7af39413d2941aa2bdf1a843b77e9ed
RUN yum install -y wget && \
yum install -y system-config-services && \
yum install -y curl && \
wget --no-cookies \
--no-check-certificate \
--header "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie" \
--output-document jdk.rpm \
http://download.oracle.com/otn-pub/java/jdk/8u66-b17/jdk-8u66-linux-x64.rpm && \
yum --nogpg localinstall -y jdk.rpm && \
rm -f jdk.rpm

@ -0,0 +1,9 @@
# CentOS 6.9 from 02/06/2017
FROM centos@sha256:a23bced61701af9a0a758e94229676d9f09996a3ff0f3d26955b06bac8c282e0
RUN yum install -y wget && \
yum install -y system-config-services && \
yum install -y curl && \
wget --output-document jdk.rpm \
http://cdn.azul.com/zulu/bin/zulu8.21.0.1-jdk8.0.131-linux.x86_64.rpm && \
yum --nogpg localinstall -y jdk.rpm && \
rm -f jdk.rpm
Loading…
Cancel
Save