Merge branch '1.3.x'

pull/5289/merge
Andy Wilkinson 9 years ago
commit f1f5066786

@ -1,4 +1,5 @@
FROM centos:6.7
# CentOS 5.11 from 22/03/2016
FROM centos@sha256:7f8a808416f712da6931ac65e4308fede7fe86bcf15364b6f63af88840fe6131
RUN yum install -y wget && \
yum install -y system-config-services && \
yum install -y curl && \

@ -1,4 +1,5 @@
FROM centos:5.11
# CentOS 6.7 from 22/03/2016
FROM centos@sha256:4f6d8f794af3574eca603b965fc0b63fdf852be29c17d3ab4cad7ec2272b82bd
RUN yum install -y wget && \
yum install -y system-config-services && \
yum install -y curl && \

@ -1,4 +1,4 @@
FROM ubuntu:14.04.3
FROM ubuntu:trusty-20160317
RUN apt-get install -y software-properties-common && \
add-apt-repository ppa:webupd8team/java -y && \
apt-get update && \
Loading…
Cancel
Save