From e001595ec281f3c822aa961a51b2be2f1b26e6b4 Mon Sep 17 00:00:00 2001 From: Moritz Maxeiner <moritz@ucworks.org> Date: Sun, 16 Sep 2018 00:05:14 +0200 Subject: [PATCH] Merge python into toolchain block --- windows/Dockerfile | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/windows/Dockerfile b/windows/Dockerfile index 5656f18..c56a7c5 100644 --- a/windows/Dockerfile +++ b/windows/Dockerfile @@ -15,7 +15,12 @@ RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tl (New-Object Net.WebClient).DownloadFile('https://github.com/Kitware/ninja/releases/download/v1.8.2.g972a7.kitware.dyndep-1/ninja-1.8.2.g972a7.kitware.dyndep-1_i686-pc-windows-msvc.zip', 'C:/ninja.zip'); \ 7z e C:/ninja.zip -oC:/ninja -y; \ Remove-Item C:/ninja.zip -Force; \ - [Environment]::SetEnvironmentVariable('PATH', "$([Environment]::GetEnvironmentVariable('PATH', [EnvironmentVariableTarget]::Machine))" + ';C:/ninja', [EnvironmentVariableTarget]::Machine) + [Environment]::SetEnvironmentVariable('PATH', "$([Environment]::GetEnvironmentVariable('PATH', [EnvironmentVariableTarget]::Machine))" + ';C:/ninja', [EnvironmentVariableTarget]::Machine); \ + choco install -y python --version 3.6.6; \ + $Env:PATH = "\"$([Environment]::GetEnvironmentVariable('PATH', [EnvironmentVariableTarget]::User));$([Environment]::GetEnvironmentVariable('PATH', [EnvironmentVariableTarget]::Machine))\""; \ + python -m pip --no-cache-dir install --no-warn-script-location \ + wheel \ + twine COPY qtifwsilent.qs C:/qtifwsilent.qs RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ @@ -27,12 +32,6 @@ RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tl [Environment]::SetEnvironmentVariable('Qt5_DIR', 'C:/Qt/5.11.1/msvc2017_64', [EnvironmentVariableTarget]::Machine); \ [Environment]::SetEnvironmentVariable('EGL_PLATFORM_DIR', 'C:/Qt/5.11.1/msvc2017_64/include/QtANGLE', [EnvironmentVariableTarget]::Machine) -RUN choco install -y python --version 3.6.6; \ - $Env:PATH = "\"$([Environment]::GetEnvironmentVariable('PATH', [EnvironmentVariableTarget]::User));$([Environment]::GetEnvironmentVariable('PATH', [EnvironmentVariableTarget]::Machine))\""; \ - python -m pip --no-cache-dir install --no-warn-script-location \ - wheel \ - twine; - RUN $vcpkg_dir = 'C:/vcpkg'; \ git clone --depth=1 https://github.com/BioroboticsLab/RF_vcpkg.git $vcpkg_dir; \ cd $vcpkg_dir; \ -- GitLab