diff options
| author |  philwo <philwo@google.com> | 2018-01-10 13:37:38 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-01-10 13:39:14 -0800 |
| commit | 96c654d43eb2906177325cbc2fc2b1e90dbcc792 (patch) | |
| tree | e2acbafc3cb2b4a407b930eab7a44b33c3610b29 | |
| parent | 19e03d7db789cc44ce3625a8ff14bcb8c1b4856c (diff) | |
Remove EOL'd Linux flavours, bump CentOS to 6.9.
This should fix the bazel-slow-tests job on CI. :)
PiperOrigin-RevId: 181510264
| -rw-r--r-- | src/test/docker/Dockerfile.centos6.9 (renamed from src/test/docker/Dockerfile.centos6.7) | 2 | ||||
| -rw-r--r-- | src/test/docker/Dockerfile.fedora23 | 9 | ||||
| -rw-r--r-- | src/test/docker/Dockerfile.ubuntu-15.04 | 8 | ||||
| -rw-r--r-- | src/test/docker/Dockerfile.ubuntu-16.04 | 8 | ||||
| -rw-r--r-- | src/test/docker/flavours.bzl | 5 |
5 files changed, 2 insertions, 30 deletions
diff --git a/src/test/docker/Dockerfile.centos6.7 b/src/test/docker/Dockerfile.centos6.9 index 7c2a067d27..90177871de 100644 --- a/src/test/docker/Dockerfile.centos6.7 +++ b/src/test/docker/Dockerfile.centos6.9 @@ -1,4 +1,4 @@ -FROM centos:centos6.7 +FROM centos:centos6.9 RUN yum -y upgrade 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(): |