From ac03c26828b90335908c401ad1632e6b4c3d3c86 Mon Sep 17 00:00:00 2001 From: ReinUsesLisp Date: Tue, 2 Jun 2020 17:14:17 -0300 Subject: [PATCH] Pre-install tsl-robin on docker image --- linux-fresh/Dockerfile | 3 ++- linux-mingw/Dockerfile | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/linux-fresh/Dockerfile b/linux-fresh/Dockerfile index 3894eec..54374f5 100644 --- a/linux-fresh/Dockerfile +++ b/linux-fresh/Dockerfile @@ -29,4 +29,5 @@ RUN useradd -m -u 1027 -s /bin/bash yuzu && \ 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 + conan install nlohmann_json/3.7.3@ -s compiler.libcxx=libstdc++11 --build=missing && \ + conan install tsl-robin-map/0.6.2@tessil/stable -s compiler.libcxx=libstdc++11 --build-missing diff --git a/linux-mingw/Dockerfile b/linux-mingw/Dockerfile index 4df14e6..380fc97 100644 --- a/linux-mingw/Dockerfile +++ b/linux-mingw/Dockerfile @@ -52,4 +52,5 @@ USER 1027 # Install/build the missing libs (uses the default mingw cross compile profile) RUN conan install catch2/2.11.0@ --build=missing && \ conan install fmt/6.2.0@ --build=missing && \ - conan install nlohmann_json/3.7.3@ --build=missing + conan install nlohmann_json/3.7.3@ --build=missing && \ + conan install tsl-robin-map/0.6.2@tessil/stable --build-missing