From ef63ff3293355a33499a06d80f8951d54c9bda4f Mon Sep 17 00:00:00 2001 From: Uilian Ries Date: Thu, 4 Oct 2018 08:36:22 -0300 Subject: [PATCH] #50 Update MSVC 14 install Signed-off-by: Uilian Ries --- msvc_14/Dockerfile | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/msvc_14/Dockerfile b/msvc_14/Dockerfile index 90829687b..bad094421 100644 --- a/msvc_14/Dockerfile +++ b/msvc_14/Dockerfile @@ -2,37 +2,26 @@ FROM microsoft/windowsservercore:10.0.14393.2068 LABEL maintainer="Luis Martinez de Bartolome " -ADD https://aka.ms/vs/15/release/vs_buildtools.exe %TEMP%\buildtools.exe - -RUN %TEMP%\buildtools.exe --quiet --wait --norestart --nocache \ - --installPath C:\BuildTools \ - --add Microsoft.VisualStudio.Workload.VCTools;includeRecommended \ - --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 \ - --add Microsoft.VisualStudio.Component.Windows10SDK.17134 \ - --add Microsoft.VisualStudio.Component.Windows10SDK.16299.Desktop \ - --add Microsoft.VisualStudio.Component.VC.140 \ - --add Microsoft.VisualStudio.Component.VC.ATL \ - --add Microsoft.VisualStudio.Component.VC.ATLMFC \ - --add Microsoft.VisualStudio.Component.VC.CLI.Support \ - || IF "%ERRORLEVEL%"=="3010" EXIT 0 - SHELL ["powershell.exe", "-ExecutionPolicy", "Bypass", "-Command"] -ENV chocolateyUseWindowsCompression=false +ENV chocolateyUseWindowsCompression=false \ + PYTHONIOENCODING=UTF-8 RUN iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1')) -RUN choco install --yes cmake --params '"/InstallDir:C:\tools\cmake"' - +RUN choco install --yes cmake --params '"/InstallDir:C:\tools\cmake"' --installargs 'ADD_CMAKE_TO_PATH=""System""' RUN choco install --yes python3 --params '"/InstallDir:C:\tools\python3"' +RUN choco install --yes --execution-timeout=7200 vcbuildtools -ia "/Full" RUN python -m pip install --upgrade pip - RUN pip install win-unicode-console RUN pip install \ conan \ conan_package_tools \ --upgrade --force-reinstall --no-cache - -WORKDIR "C:/Users/ContainerAdministrator" \ No newline at end of file + +RUN mkdir "C:\.conan" + +WORKDIR "C:/Users/ContainerAdministrator" +ENTRYPOINT ["cmd.exe", "C:\\Program Files (x86)\\Microsoft Visual C++ Build Tools\\vcbuildtools_msbuild.bat"]