From 96c654d43eb2906177325cbc2fc2b1e90dbcc792 Mon Sep 17 00:00:00 2001
From: philwo <philwo@google.com>
Date: Wed, 10 Jan 2018 13:37:38 -0800
Subject: Remove EOL'd Linux flavours, bump CentOS to 6.9.

This should fix the bazel-slow-tests job on CI. :)

PiperOrigin-RevId: 181510264
---
 src/test/docker/Dockerfile.centos6.7    | 16 ----------------
 src/test/docker/Dockerfile.centos6.9    | 16 ++++++++++++++++
 src/test/docker/Dockerfile.fedora23     |  9 ---------
 src/test/docker/Dockerfile.ubuntu-15.04 |  8 --------
 src/test/docker/Dockerfile.ubuntu-16.04 |  8 --------
 src/test/docker/flavours.bzl            |  5 +----
 6 files changed, 17 insertions(+), 45 deletions(-)
 delete mode 100644 src/test/docker/Dockerfile.centos6.7
 create mode 100644 src/test/docker/Dockerfile.centos6.9
 delete mode 100644 src/test/docker/Dockerfile.fedora23
 delete mode 100644 src/test/docker/Dockerfile.ubuntu-15.04
 delete mode 100644 src/test/docker/Dockerfile.ubuntu-16.04

diff --git a/src/test/docker/Dockerfile.centos6.7 b/src/test/docker/Dockerfile.centos6.7
deleted file mode 100644
index 7c2a067d27..0000000000
--- a/src/test/docker/Dockerfile.centos6.7
+++ /dev/null
@@ -1,16 +0,0 @@
-FROM centos:centos6.7
-
-RUN yum -y upgrade
-
-RUN yum -y install \
-    wget git findutils binutils \
-    zip unzip tar gzip zlib-devel \
-    clang gcc gcc-c++ \
-    java java-devel java-1.8.0-openjdk-devel \
-    python; yum clean all
-
-RUN wget http://people.centos.org/tru/devtools-2/devtools-2.repo -O /etc/yum.repos.d/devtools-2.repo
-RUN yum -y install devtoolset-2-gcc devtoolset-2-gcc-c++ devtoolset-2-binutils; yum clean all
-
-ENV JAVA_HOME /usr/lib/jvm/java-1.8.0
-ENV CC /opt/rh/devtoolset-2/root/usr/bin/gcc
diff --git a/src/test/docker/Dockerfile.centos6.9 b/src/test/docker/Dockerfile.centos6.9
new file mode 100644
index 0000000000..90177871de
--- /dev/null
+++ b/src/test/docker/Dockerfile.centos6.9
@@ -0,0 +1,16 @@
+FROM centos:centos6.9
+
+RUN yum -y upgrade
+
+RUN yum -y install \
+    wget git findutils binutils \
+    zip unzip tar gzip zlib-devel \
+    clang gcc gcc-c++ \
+    java java-devel java-1.8.0-openjdk-devel \
+    python; yum clean all
+
+RUN wget http://people.centos.org/tru/devtools-2/devtools-2.repo -O /etc/yum.repos.d/devtools-2.repo
+RUN yum -y install devtoolset-2-gcc devtoolset-2-gcc-c++ devtoolset-2-binutils; yum clean all
+
+ENV JAVA_HOME /usr/lib/jvm/java-1.8.0
+ENV CC /opt/rh/devtoolset-2/root/usr/bin/gcc
diff --git a/src/test/docker/Dockerfile.fedora23 b/src/test/docker/Dockerfile.fedora23
deleted file mode 100644
index 26b50d236d..0000000000
--- a/src/test/docker/Dockerfile.fedora23
+++ /dev/null
@@ -1,9 +0,0 @@
-FROM fedora:23
-
-RUN dnf -y update && dnf clean all
-RUN dnf -y install \
-    findutils binutils gcc tar git libstdc++-static \
-    gzip zip unzip zlib-devel \
-    clang java java-devel python \
-    && dnf clean all
-ENV JAVA_HOME /usr/lib/jvm/java-openjdk
diff --git a/src/test/docker/Dockerfile.ubuntu-15.04 b/src/test/docker/Dockerfile.ubuntu-15.04
deleted file mode 100644
index 98e09594e0..0000000000
--- a/src/test/docker/Dockerfile.ubuntu-15.04
+++ /dev/null
@@ -1,8 +0,0 @@
-FROM ubuntu:15.04
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends \
-      curl ca-certificates ca-certificates-java \
-      git pkg-config \
-      zip unzip zlib1g-dev libarchive-dev \
-      g++ gcc openjdk-8-jdk python && \
-    apt-get clean
diff --git a/src/test/docker/Dockerfile.ubuntu-16.04 b/src/test/docker/Dockerfile.ubuntu-16.04
deleted file mode 100644
index 7f1cbb8dca..0000000000
--- a/src/test/docker/Dockerfile.ubuntu-16.04
+++ /dev/null
@@ -1,8 +0,0 @@
-FROM ubuntu:16.04
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends \
-      curl ca-certificates ca-certificates-java \
-      git pkg-config \
-      zip unzip zlib1g-dev libarchive-dev \
-      g++ gcc openjdk-8-jdk python && \
-    apt-get clean
diff --git a/src/test/docker/flavours.bzl b/src/test/docker/flavours.bzl
index 713c7c5243..9ba4ddff13 100644
--- a/src/test/docker/flavours.bzl
+++ b/src/test/docker/flavours.bzl
@@ -20,11 +20,8 @@
 load("//src/test/docker:docker_pull.bzl", "docker_pull")
 
 FLAVOURS = [
-    "centos6.7",
+    "centos6.9",
     "debian-stretch",
-    "fedora23",
-    "ubuntu-15.04",
-    "ubuntu-16.04",
 ]
 
 def pull_images_for_docker_tests():
-- 
cgit v1.2.3