yuzu/build-environments
1
0
Fork 0
mirror of https://github.com/yuzu-emu/build-environments.git synced 2025-09-20 22:07:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Dockerfile

Browse source 
move cmake before user
This commit is contained in:
qurious-pixel 2020-07-22 18:26:21 -07:00 committed by GitHub
parent 6821915702
commit 92f02bf954
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
linux-appimage/Dockerfile
View file

@ -46,14 +46,15 @@ RUN useradd -m -u 1027 -s /bin/bash yuzu && \
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
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 nlohmann_json/3.7.3@ -s compiler.libcxx=libstdc++11 --build=missing
ENV CMAKEVER=3.18.0 ENV CMAKEVER=3.18.0
RUN \ RUN \
curl -sLO https://cmake.org/files/v${CMAKEVER%.*}/cmake-${CMAKEVER}-Linux-x86_64.sh && \ 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 --skip-license && \
rm ./cmake*.sh && \ rm ./cmake*.sh && \
cmake --version cmake --version
USER 1027
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 nlohmann_json/3.7.3@ -s compiler.libcxx=libstdc++11 --build=missing