Add Dockerfiles for: Ubuntu 18.04 (x64), Ubuntu 16.04 (ARM), Ubuntu 17.10 (ARM)

15 files changed, 92 insertions, 9 deletions

diff --git a/extras/dockerfiles/Dockerfile.ubuntu-18.04 b/extras/dockerfiles/Dockerfile.ubuntu-18.04
new file mode 100644
index 0000000..ec5d5cb
--- /dev/null
+++ b/extras/dockerfiles/Dockerfile.ubuntu-18.04
@@ -0,0 +1,9 @@
+FROM ubuntu:18.04
+MAINTAINER Marco Poletti <poletti.marco@gmail.com>
+
+COPY ubuntu-18.04_custom.list /etc/apt/sources.list.d/
+COPY common_install.sh common_cleanup.sh ubuntu-18.04_install.sh /
+
+RUN bash -x /common_install.sh && \
+    bash -x /ubuntu-18.04_install.sh && \
+    bash -x /common_cleanup.sh
diff --git a/extras/dockerfiles/Dockerfile.ubuntu_arm-16.04 b/extras/dockerfiles/Dockerfile.ubuntu_arm-16.04
new file mode 100644
index 0000000..35342b9
--- /dev/null
+++ b/extras/dockerfiles/Dockerfile.ubuntu_arm-16.04
@@ -0,0 +1,9 @@
+FROM multiarch/ubuntu-core:arm64-xenial
+MAINTAINER Marco Poletti <poletti.marco@gmail.com>
+
+COPY ubuntu_arm-16.04_custom.list /etc/apt/sources.list.d/
+COPY common_install.sh common_cleanup.sh ubuntu_arm-16.04_install.sh /
+
+RUN bash -x /common_install.sh && \
+    bash -x /ubuntu_arm-16.04_install.sh && \
+    bash -x /common_cleanup.sh
diff --git a/extras/dockerfiles/Dockerfile.ubuntu_arm-17.10 b/extras/dockerfiles/Dockerfile.ubuntu_arm-17.10
new file mode 100644
index 0000000..f2d8b30
--- /dev/null
+++ b/extras/dockerfiles/Dockerfile.ubuntu_arm-17.10
@@ -0,0 +1,9 @@
+FROM multiarch/ubuntu-core:arm64-artful
+MAINTAINER Marco Poletti <poletti.marco@gmail.com>
+
+COPY ubuntu_arm-17.10_custom.list /etc/apt/sources.list.d/
+COPY common_install.sh common_cleanup.sh ubuntu_arm-17.10_install.sh /
+
+RUN bash -x /common_install.sh && \
+    bash -x /ubuntu_arm-17.10_install.sh && \
+    bash -x /common_cleanup.sh
diff --git a/extras/dockerfiles/common_cleanup.sh b/extras/dockerfiles/common_cleanup.sh
index a02258a..5ef0745 100644
--- a/extras/dockerfiles/common_cleanup.sh
+++ b/extras/dockerfiles/common_cleanup.sh
@@ -3,13 +3,8 @@
 set -e
 
 # Strip some binaries that aren't already stripped, to save space.
-for f in $(find /usr/lib/ /usr/bin -type f | fgrep -v bazel | fgrep -v python)
-do
-  if file "$f" | fgrep 'executable' | fgrep -q 'stripped'
-  then
-    strip --strip-unneeded $f
-  fi
-done
+find /usr/lib/ /usr/bin -type f | fgrep -v bazel | fgrep -v python | \
+    xargs -P 32 -L 1 bash -c 'file "$0" | fgrep executable | fgrep -q stripped && strip --strip-unneeded "$0" || true'
 
 # This was only needed above, we don't need it in the final image.
 apt-get remove -y wget file python3-pip
diff --git a/extras/dockerfiles/common_install.sh b/extras/dockerfiles/common_install.sh
index 154ffd5..cb4398a 100644
--- a/extras/dockerfiles/common_install.sh
+++ b/extras/dockerfiles/common_install.sh
@@ -3,7 +3,7 @@
 set -e
 
 apt-get update -qq
-apt-get install -y --no-install-recommends wget
+apt-get install -y --no-install-recommends wget gnupg
 
 wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | apt-key add -
 
@@ -21,7 +21,6 @@ apt-get install -y --allow-unauthenticated --no-install-recommends \
     cmake \
     libboost-dev \
     g++-5 \
-    clang-3.8 \
     clang-3.9 \
     clang-4.0 \
     libc++-dev \
diff --git a/extras/dockerfiles/ubuntu-14.04_install.sh b/extras/dockerfiles/ubuntu-14.04_install.sh
index edb7825..974c3d1 100644
--- a/extras/dockerfiles/ubuntu-14.04_install.sh
+++ b/extras/dockerfiles/ubuntu-14.04_install.sh
@@ -6,4 +6,5 @@ apt-get install -y --allow-unauthenticated --no-install-recommends \
     clang-3.5 \
     clang-3.6 \
     clang-3.7 \
+    clang-3.8 \
     g++-4.9
diff --git a/extras/dockerfiles/ubuntu-16.04_install.sh b/extras/dockerfiles/ubuntu-16.04_install.sh
index 1452630..391231b 100644
--- a/extras/dockerfiles/ubuntu-16.04_install.sh
+++ b/extras/dockerfiles/ubuntu-16.04_install.sh
@@ -12,6 +12,7 @@ apt-get install -y --allow-unauthenticated --no-install-recommends \
     clang-3.5 \
     clang-3.6 \
     clang-3.7 \
+    clang-3.8 \
     g++-4.9 \
     g++-6 \
     python \
diff --git a/extras/dockerfiles/ubuntu-17.04_install.sh b/extras/dockerfiles/ubuntu-17.04_install.sh
index afa7b5e..89a9f5c 100644
--- a/extras/dockerfiles/ubuntu-17.04_install.sh
+++ b/extras/dockerfiles/ubuntu-17.04_install.sh
@@ -6,6 +6,7 @@ apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 1E9377A2BA9EF27F
 
 apt-get install -y --allow-unauthenticated --no-install-recommends \
     clang-3.7 \
+    clang-3.8 \
     g++-4.9 \
     g++-6 \
     python \
diff --git a/extras/dockerfiles/ubuntu-17.10_install.sh b/extras/dockerfiles/ubuntu-17.10_install.sh
index f04ce6e..799ddf9 100644
--- a/extras/dockerfiles/ubuntu-17.10_install.sh
+++ b/extras/dockerfiles/ubuntu-17.10_install.sh
@@ -6,6 +6,7 @@ apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 1E9377A2BA9EF27F
 
 apt-get install -y --allow-unauthenticated --no-install-recommends \
     g++-7 \
+    clang-3.8 \
     clang-5.0 \
     python \
     python3-sh \
diff --git a/extras/dockerfiles/ubuntu-18.04_custom.list b/extras/dockerfiles/ubuntu-18.04_custom.list
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/extras/dockerfiles/ubuntu-18.04_custom.list
diff --git a/extras/dockerfiles/ubuntu-18.04_install.sh b/extras/dockerfiles/ubuntu-18.04_install.sh
new file mode 100644
index 0000000..fa240d3
--- /dev/null
+++ b/extras/dockerfiles/ubuntu-18.04_install.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -e
+
+apt-get install -y --allow-unauthenticated --no-install-recommends \
+    g++-7 \
+    g++-8 \
+    clang-5.0 \
+    clang-6.0 \
+    python \
+    python3-sh \
+    python3-typed-ast \
+    clang-format
diff --git a/extras/dockerfiles/ubuntu_arm-16.04_custom.list b/extras/dockerfiles/ubuntu_arm-16.04_custom.list
new file mode 100644
index 0000000..0ba95de
--- /dev/null
+++ b/extras/dockerfiles/ubuntu_arm-16.04_custom.list
@@ -0,0 +1,10 @@
+deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu xenial main 
+deb-src http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu xenial main
+deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial main
+deb-src http://apt.llvm.org/xenial/ llvm-toolchain-xenial main
+deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-3.8 main
+deb-src http://apt.llvm.org/xenial/ llvm-toolchain-xenial-3.8 main
+deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-3.9 main
+deb-src http://apt.llvm.org/xenial/ llvm-toolchain-xenial-3.9 main
+deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-4.0 main
+deb-src http://apt.llvm.org/xenial/ llvm-toolchain-xenial-4.0 main
diff --git a/extras/dockerfiles/ubuntu_arm-16.04_install.sh b/extras/dockerfiles/ubuntu_arm-16.04_install.sh
new file mode 100644
index 0000000..c04008d
--- /dev/null
+++ b/extras/dockerfiles/ubuntu_arm-16.04_install.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -e
+
+apt-get install -y --allow-unauthenticated --no-install-recommends \
+    clang-3.5 \
+    clang-3.6 \
+    clang-3.7 \
+    g++-4.9 \
+    g++-6 \
+    python \
+    clang-format
diff --git a/extras/dockerfiles/ubuntu_arm-17.10_custom.list b/extras/dockerfiles/ubuntu_arm-17.10_custom.list
new file mode 100644
index 0000000..69c660b
--- /dev/null
+++ b/extras/dockerfiles/ubuntu_arm-17.10_custom.list
@@ -0,0 +1,8 @@
+#deb [trusted=yes] http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu artful main
+#deb-src [trusted=yes] http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu artful main
+#deb [trusted=yes] http://apt.llvm.org/artful/ llvm-toolchain-artful main
+#deb-src [trusted=yes] http://apt.llvm.org/artful/ llvm-toolchain-artful main
+#deb [trusted=yes] http://apt.llvm.org/artful/ llvm-toolchain-artful-4.0 main
+#deb-src [trusted=yes] http://apt.llvm.org/artful/ llvm-toolchain-artful-4.0 main
+#deb [trusted=yes] http://apt.llvm.org/artful/ llvm-toolchain-artful-5.0 main
+#deb-src [trusted=yes] http://apt.llvm.org/artful/ llvm-toolchain-artful-5.0 main
diff --git a/extras/dockerfiles/ubuntu_arm-17.10_install.sh b/extras/dockerfiles/ubuntu_arm-17.10_install.sh
new file mode 100644
index 0000000..8883fd4
--- /dev/null
+++ b/extras/dockerfiles/ubuntu_arm-17.10_install.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+
+#apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 1E9377A2BA9EF27F
+
+apt-get install -y --allow-unauthenticated --no-install-recommends \
+    g++-7 \
+    clang-5.0 \
+    python \
+    python3-sh \
+    python3-typed-ast \
+    clang-format
+
+pip3 install typed_ast