From 2e7efdc1804baadbe1bbb9a7b98237f891fc1207 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Tue, 15 May 2018 23:14:00 +0200 Subject: [PATCH] Update Ubuntu docker images to Ubuntu 18.04 (#7523) --- dockerfiles/ubuntu_amd64/Dockerfile | 53 ++++++++++++++++++----------- dockerfiles/ubuntu_i686/Dockerfile | 8 ++--- 2 files changed, 36 insertions(+), 25 deletions(-) diff --git a/dockerfiles/ubuntu_amd64/Dockerfile b/dockerfiles/ubuntu_amd64/Dockerfile index cd4adc5bc3..97a7b395f1 100644 --- a/dockerfiles/ubuntu_amd64/Dockerfile +++ b/dockerfiles/ubuntu_amd64/Dockerfile @@ -1,24 +1,39 @@ -FROM ubuntu:16.04 +FROM ubuntu:18.04 + +# Ubuntu 18.04 already comes with GCC 7 available, there's no need to install PPA for it, +# but leave the commands for future updates + +#RUN \ +# apt-get update && \ +# apt-get install -y software-properties-common && \ +# add-apt-repository ppa:ubuntu-toolchain-r/test && \ +# apt-get update && \ +# apt-get install -y g++-7 && \ +# update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-7 60 + +# Ubuntu 18.04 already comes with clang 5.0 available, there's no need to install repository for it, +# but leave the commands for future updates +#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/bionic/ llvm-toolchain-bionic-5.0 main" > /etc/apt/sources.list.d/clang5.list \ +# && apt-get update \ +# && apt-get install -y \ +# clang-5.0 \ +# git-core \ +# && ln -s /usr/bin/clang-5.0 /usr/bin/clang \ +# && ln -s /usr/bin/clang++-5.0 /usr/bin/clang++ + +# Ubuntu 18.04 already comes with cmake 3.10 available, there's no need to install it manually, +# but leave the commands for future updates +#RUN curl https://cmake.org/files/v3.9/cmake-3.9.4-Linux-x86_64.sh -o cmake.sh && sh cmake.sh --skip-license --exclude-subdir --prefix=/usr/local + RUN \ apt-get update && \ - apt-get install -y software-properties-common && \ - add-apt-repository ppa:ubuntu-toolchain-r/test && \ - apt-get update && \ - apt-get install -y g++-7 && \ - update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-7 60 -# 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-5.0 main" > /etc/apt/sources.list.d/clang5.list \ - && apt-get update \ - && apt-get install -y \ - clang-5.0 \ - git-core \ - && ln -s /usr/bin/clang-5.0 /usr/bin/clang \ - && ln -s /usr/bin/clang++-5.0 /usr/bin/clang++ -RUN curl https://cmake.org/files/v3.9/cmake-3.9.4-Linux-x86_64.sh -o cmake.sh && sh cmake.sh --skip-license --exclude-subdir --prefix=/usr/local + apt-get install -y git-core g++ clang-5.0 && \ + ln -s /usr/bin/clang-5.0 /usr/bin/clang && \ + ln -s /usr/bin/clang++-5.0 /usr/bin/clang++ + RUN apt-get -y upgrade # 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 ninja-build libicu-dev diff --git a/dockerfiles/ubuntu_i686/Dockerfile b/dockerfiles/ubuntu_i686/Dockerfile index df46d67858..c6c64cae56 100644 --- a/dockerfiles/ubuntu_i686/Dockerfile +++ b/dockerfiles/ubuntu_i686/Dockerfile @@ -1,13 +1,9 @@ -FROM ubuntu:16.04 +FROM ubuntu:18.04 RUN dpkg --add-architecture i386 RUN \ - apt-get update && \ - apt-get install -y software-properties-common && \ - add-apt-repository ppa:ubuntu-toolchain-r/test && \ apt-get update && \ apt-get install -y g++-7-multilib && \ update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-7 60 RUN apt-get update RUN apt-get -y upgrade -RUN apt-get install --no-install-recommends -y curl ca-certificates libsdl2-dev:i386 libsdl2-ttf-dev:i386 pkg-config:i386 libjansson-dev:i386 libspeex-dev:i386 libspeexdsp-dev:i386 libcurl4-openssl-dev:i386 libcrypto++-dev:i386 libfontconfig1-dev:i386 libfreetype6-dev:i386 libpng-dev:i386 libzip-dev:i386 libssl-dev:i386 ninja-build libicu-dev:i386 -RUN curl https://cmake.org/files/v3.9/cmake-3.9.4-Linux-x86_64.sh -o cmake.sh && sh cmake.sh --skip-license --exclude-subdir --prefix=/usr/local +RUN apt-get install --no-install-recommends -y cmake curl ca-certificates libsdl2-dev:i386 libsdl2-ttf-dev:i386 pkg-config:i386 libjansson-dev:i386 libspeex-dev:i386 libspeexdsp-dev:i386 libcurl4-openssl-dev:i386 libcrypto++-dev:i386 libfontconfig1-dev:i386 libfreetype6-dev:i386 libpng-dev:i386 libzip-dev:i386 libssl-dev:i386 ninja-build libicu-dev:i386