mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update Ubuntu docker images to Ubuntu 18.04 (#7523)

This commit is contained in:
Michał Janiszewski 2018-05-15 23:14:00 +02:00 committed by GitHub
parent 174acdb68d
commit 2e7efdc180
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
dockerfiles/ubuntu_amd64/Dockerfile
View File

@ -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

8
dockerfiles/ubuntu_i686/Dockerfile
View File

@ -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