From 92f02bf9548f63656d067cebccd9cc5265900b7b Mon Sep 17 00:00:00 2001 From: qurious-pixel <62252937+qurious-pixel@users.noreply.github.com> Date: Wed, 22 Jul 2020 18:26:21 -0700 Subject: [PATCH] Update Dockerfile move cmake before user --- linux-appimage/Dockerfile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/linux-appimage/Dockerfile b/linux-appimage/Dockerfile index a13f53e..ac62789 100644 --- a/linux-appimage/Dockerfile +++ b/linux-appimage/Dockerfile @@ -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 +