From 6f5de9f3cce6e295e80c69cc67732470af34b5c3 Mon Sep 17 00:00:00 2001 From: Speak2Erase Date: Sun, 17 Oct 2021 02:35:00 -0700 Subject: [PATCH] Update dockerfiles --- Dockerfile-linux | 1 + Dockerfile-windows | 18 +++++++++--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Dockerfile-linux b/Dockerfile-linux index dba04c6b..45f6f0ee 100644 --- a/Dockerfile-linux +++ b/Dockerfile-linux @@ -2,6 +2,7 @@ FROM conanio/gcc5 RUN conan remote add eliza "https://rkevin.jfrog.io/artifactory/api/conan/eliza" && \ conan remote add bincrafters "https://bincrafters.jfrog.io/artifactory/api/conan/public-conan" && \ +conan remote add astrabit "https://rkevin.jfrog.io/artifactory/api/conan/astrabit" && \ conan config set general.revisions_enabled=1 RUN sudo apt update && DEBIAN_FRONTEND=noninteractive sudo apt install -y \ diff --git a/Dockerfile-windows b/Dockerfile-windows index a705e50e..a4a995df 100644 --- a/Dockerfile-windows +++ b/Dockerfile-windows @@ -8,17 +8,17 @@ ADD https://aka.ms/vs/16/release/vs_community.exe /vs_community.exe RUN C:\vs_community.exe --quiet --wait --norestart --nocache --add Microsoft.VisualStudio.Workload.NativeDesktop --includeRecommended # install chocolatey and use it to install cmake, git, conan, vim (vim for xxd only, since installing cygwin breaks docker) -RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; ` -iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1')); ` -choco install -y cmake git conan vim +RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 +RUN iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1')) +RUN choco install -y cmake git conan vim # configure path (add xxd and cmake), conan remotes, and fix windows path size limits for conan -RUN [Environment]::SetEnvironmentVariable('Path', $env:Path + ';C:\Program Files\CMake\bin;C:\tools\vim\vim82', 'Machine'); ` -conan remote add eliza https://rkevin.jfrog.io/artifactory/api/conan/eliza; ` -conan remote add bincrafters https://bincrafters.jfrog.io/artifactory/api/conan/public-conan; ` -conan remote add astrabit https://rkevin.jfrog.io/artifactory/api/conan/astrabit; ` -conan config set general.revisions_enabled=1; ` -setx CONAN_USE_ALWAYS_SHORT_PATHS 1 +RUN [Environment]::SetEnvironmentVariable('Path', $env:Path + ';C:\Program Files\CMake\bin;C:\tools\vim\vim82', 'Machine') +RUN conan remote add eliza https://rkevin.jfrog.io/artifactory/api/conan/eliza +RUN conan remote add bincrafters https://bincrafters.jfrog.io/artifactory/api/conan/public-conan +RUN conan remote add astrabit https://rkevin.jfrog.io/artifactory/api/conan/astrabit +RUN conan config set general.revisions_enabled=1 +RUN setx CONAN_USE_ALWAYS_SHORT_PATHS 1 # prebuild all dependencies using the conanfile in this commit COPY conanfile.py C:/Temp/install_deps/