mirror of
https://github.com/yuzu-emu/build-environments.git
synced 2025-09-20 14:07:09 +00:00
Update Dockerfile
move cmake before user
This commit is contained in:
parent
6821915702
commit
92f02bf954
|
@ -46,14 +46,15 @@ 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
|
||||
|
||||
|
||||
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
|
||||
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
|
||||
|
||||
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
|
||||
|
||||
|
|
Loading…
Reference in a new issue