mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 11:03:00 +01:00
Code Issues Releases Wiki Activity

Install GCC 7 for Ubuntu docker images

Browse Source 
This only installs g++.
This commit is contained in:
Michał Janiszewski
2018-03-20 15:44:03 +01:00
parent 919533d7c2
commit 084589d9e0
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
dockerfiles/ubuntu_amd64/Dockerfile
View File

@@ -1,4 +1,11 @@
FROM ubuntu:16.04
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 \
@@ -8,8 +15,6 @@ RUN apt-get update \
&& 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++

9
dockerfiles/ubuntu_i686/Dockerfile
View File

@@ -1,6 +1,13 @@
FROM ubuntu:16.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 gcc-multilib g++-multilib 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
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
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