From ca7aca6a097c6dc8e30854b7ddabb390eb2a99cf Mon Sep 17 00:00:00 2001 From: qurious-pixel <62252937+qurious-pixel@users.noreply.github.com> Date: Wed, 22 Jul 2020 19:01:55 -0700 Subject: [PATCH] Update Dockerfile add build prefix for cmake set GCC version --- linux-appimage/Dockerfile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/linux-appimage/Dockerfile b/linux-appimage/Dockerfile index ac62789..d8c1004 100644 --- a/linux-appimage/Dockerfile +++ b/linux-appimage/Dockerfile @@ -46,10 +46,16 @@ RUN useradd -m -u 1027 -s /bin/bash yuzu && \ pip install conan && \ apt-get clean autoclean && apt-get autoremove --yes && rm -rf /var/lib/apt /var/lib/dpkg /var/lib/cache /var/lib/log +RUN \ + update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${GCCVER} 10 \ + update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-${GCCVER} 10 \ + gcc --version \ + g++ --version + ENV CMAKEVER=3.18.0 RUN \ curl -sLO https://cmake.org/files/v${CMAKEVER%.*}/cmake-${CMAKEVER}-Linux-x86_64.sh && \ - sh cmake-${CMAKEVER}-Linux-x86_64.sh --skip-license && \ + sh cmake-${CMAKEVER}-Linux-x86_64.sh --prefix=/usr --skip-license && \ rm ./cmake*.sh && \ cmake --version