Add a Dockerfile for Ubuntu 17.04, for CI testing in Travis CI.

google · Apr 15, 2017 · 0e7cb0e · 0e7cb0e
1 parent ecb092b
commit 0e7cb0e
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 6 deletions.
diff --git a/extras/dockerfiles/Dockerfile.ubuntu-17.04 b/extras/dockerfiles/Dockerfile.ubuntu-17.04
@@ -0,0 +1,9 @@
+FROM ubuntu:17.04
+MAINTAINER Marco Poletti <poletti.marco@gmail.com>
+
+COPY ubuntu-17.04_custom.list /etc/apt/sources.list.d/
+COPY common_install.sh common_cleanup.sh ubuntu-17.04_install.sh /
+
+RUN bash -x /common_install.sh && \
+    bash -x /ubuntu-17.04_install.sh && \
+    bash -x /common_cleanup.sh
diff --git a/extras/dockerfiles/common_install.sh b/extras/dockerfiles/common_install.sh
@@ -8,10 +8,10 @@ apt-get install -y --no-install-recommends wget
 wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | apt-key add -
 
 # 1E9377A2BA9EF27F is the key for the ubuntu-toolchain-r PPA.
-apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 1E9377A2BA9EF27F
+apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 1E9377A2BA9EF27F | cat
 
 apt-get update -qq
-apt-get install -y --no-install-recommends \
+apt-get install -y --allow-unauthenticated --no-install-recommends \
     file \
     valgrind \
     make \
@@ -20,16 +20,16 @@ apt-get install -y --no-install-recommends \
     g++-4.8 \
     g++-4.9 \
     g++-5 \
-    clang-3.5 \
-    clang-3.6 \
     clang-3.7 \
     clang-3.8 \
     clang-3.9 \
     clang-4.0 \
     libc++-dev \
     python3-pytest \
     python3-pip \
-    python3-setuptools
-
+    python3-setuptools \
+    dirmngr
+
 pip3 install --upgrade pip
+pip3 install wheel
 pip3 install pytest-xdist
diff --git a/extras/dockerfiles/ubuntu-14.04_install.sh b/extras/dockerfiles/ubuntu-14.04_install.sh
@@ -2,5 +2,9 @@
 
 set -e
 
+apt-get install -y --allow-unauthenticated --no-install-recommends \
+    clang-3.5 \
+    clang-3.6
+
 # python3-sh doesn't exist in Ubuntu 14.04, we must install it via pip instead.
 pip3 install --user sh
diff --git a/extras/dockerfiles/ubuntu-16.04_install.sh b/extras/dockerfiles/ubuntu-16.04_install.sh
@@ -9,6 +9,8 @@ apt-get install -y --no-install-recommends \
 curl https://bazel.build/bazel-release.pub.gpg | apt-key add -
 
 apt-get install -y --allow-unauthenticated --no-install-recommends \
+    clang-3.5 \
+    clang-3.6 \
     g++-6 \
     python \
     python3-sh \

diff --git a/extras/dockerfiles/ubuntu-17.04_custom.list b/extras/dockerfiles/ubuntu-17.04_custom.list
@@ -0,0 +1,8 @@
+deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu zesty main 
+deb-src http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu zesty main
+deb http://apt.llvm.org/zesty/ llvm-toolchain-zesty main
+deb-src http://apt.llvm.org/zesty/ llvm-toolchain-zesty main
+deb http://apt.llvm.org/zesty/ llvm-toolchain-zesty-3.9 main
+deb-src http://apt.llvm.org/zesty/ llvm-toolchain-zesty-3.9 main
+deb http://apt.llvm.org/zesty/ llvm-toolchain-zesty-4.0 main
+deb-src http://apt.llvm.org/zesty/ llvm-toolchain-zesty-4.0 main
diff --git a/extras/dockerfiles/ubuntu-17.04_install.sh b/extras/dockerfiles/ubuntu-17.04_install.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -e
+
+apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 1E9377A2BA9EF27F
+
+apt-get install -y --allow-unauthenticated --no-install-recommends \
+    g++-6 \
+    python \
+    python3-sh