From 3750a890899a8777a1bebad864db3dc4cf1d79b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Wed, 14 Jun 2017 23:19:56 +0200 Subject: [PATCH] Update ubuntu_amd64 docker image to clang 4.0 --- dockerfiles/ubuntu_amd64/Dockerfile | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dockerfiles/ubuntu_amd64/Dockerfile b/dockerfiles/ubuntu_amd64/Dockerfile index 1f383664ee..2b3388d23d 100644 --- a/dockerfiles/ubuntu_amd64/Dockerfile +++ b/dockerfiles/ubuntu_amd64/Dockerfile @@ -1,4 +1,18 @@ FROM ubuntu:16.04 -RUN apt-get update +# based on sstrakh/xenial-boost-clang but imported as source, +# due to upstream image being obsolete and we don't need boost. +RUN apt-get update \ + && apt-get install -y curl sudo \ + && curl http://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add - \ + && echo "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-4.0 main" > /etc/apt/sources.list.d/clang4.list \ + && apt-get update \ + && apt-get install -y \ + clang-4.0 \ + gcc \ + g++ \ + git-core \ + && ln -s /usr/bin/clang-4.0 /usr/bin/clang \ + && ln -s /usr/bin/clang++-4.0 /usr/bin/clang++ RUN apt-get -y upgrade -RUN apt-get install --no-install-recommends -y cmake libsdl2-dev libsdl2-ttf-dev pkg-config g++ gcc libjansson-dev libspeex-dev libspeexdsp-dev libcurl4-openssl-dev libcrypto++-dev libfontconfig1-dev libfreetype6-dev libpng-dev libzip-dev git libssl-dev clang +# clang and gcc already installed +RUN apt-get install --no-install-recommends -y cmake libsdl2-dev libsdl2-ttf-dev pkg-config libjansson-dev libspeex-dev libspeexdsp-dev libcurl4-openssl-dev libcrypto++-dev libfontconfig1-dev libfreetype6-dev libpng-dev libzip-dev git libssl-dev