mirror of
https://github.com/yuzu-emu/build-environments.git
synced 2025-09-20 20:37:08 +00:00
Update Dockerfile
update cmake version 3.18 update GCC version 10
This commit is contained in:
parent
063b787a82
commit
3c7907c771
|
@ -1,10 +1,24 @@
|
||||||
FROM ubuntu:18.04
|
FROM ubuntu:18.04
|
||||||
MAINTAINER quriouspixel
|
MAINTAINER quriouspixel
|
||||||
|
|
||||||
|
ENV QTVER=5.14.2
|
||||||
|
ENV QTVERMIN=514
|
||||||
|
ENV LLVMVER=10
|
||||||
|
ENV GCCVER=10
|
||||||
|
|
||||||
|
ENV CLANG_BINARY=clang-${LLVMVER}
|
||||||
|
ENV CLANGXX_BINARY=clang++-${LLVMVER}
|
||||||
|
ENV LLD_BINARY=lld-${LLVMVER}
|
||||||
|
ENV GCC_BINARY=gcc-${GCCVER}
|
||||||
|
ENV GXX_BINARY=g++-${GCCVER}
|
||||||
|
|
||||||
# Create a user account yuzu (UID 1027) that the container will run as
|
# Create a user account yuzu (UID 1027) that the container will run as
|
||||||
RUN useradd -m -u 1027 -s /bin/bash yuzu && \
|
RUN useradd -m -u 1027 -s /bin/bash yuzu && \
|
||||||
|
add-apt-repository -y ppa:ubuntu-toolchain-r/test && \
|
||||||
DEBIAN_FRONTEND=noninteractive apt-get update && apt-get -y full-upgrade && \
|
DEBIAN_FRONTEND=noninteractive apt-get update && apt-get -y full-upgrade && \
|
||||||
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
|
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
|
||||||
build-essential \
|
build-essential \
|
||||||
|
$GCC_BINARY $GXX_BINARY \
|
||||||
libboost-all-dev \
|
libboost-all-dev \
|
||||||
liblz4-dev \
|
liblz4-dev \
|
||||||
libsdl2-dev \
|
libsdl2-dev \
|
||||||
|
@ -29,7 +43,15 @@ RUN useradd -m -u 1027 -s /bin/bash yuzu && \
|
||||||
ninja-build && \
|
ninja-build && \
|
||||||
pip install conan && \
|
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
|
apt-get clean autoclean && apt-get autoremove --yes && rm -rf /var/lib/apt /var/lib/dpkg /var/lib/cache /var/lib/log
|
||||||
|
|
||||||
|
|
||||||
USER 1027
|
USER 1027
|
||||||
RUN conan install catch2/2.11.0@ -s compiler.libcxx=libstdc++11 --build=missing && \
|
RUN conan install catch2/2.11.0@ -s compiler.libcxx=libstdc++11 --build=missing && \
|
||||||
conan install fmt/6.2.0@ -s compiler.libcxx=libstdc++11 --build=missing && \
|
conan install fmt/6.2.0@ -s compiler.libcxx=libstdc++11 --build=missing && \
|
||||||
conan install nlohmann_json/3.7.3@ -s compiler.libcxx=libstdc++11 --build=missing
|
conan install nlohmann_json/3.7.3@ -s compiler.libcxx=libstdc++11 --build=missing
|
||||||
|
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 && \
|
||||||
|
rm ./cmake*.sh && \
|
||||||
|
cmake --version
|
||||||
|
|
Loading…
Reference in a new issue