From b4d78bc74161ad2790d3d4f0ca68bb4e3dc7a3c3 Mon Sep 17 00:00:00 2001
From: Moritz Maxeiner <mm@ucw.sh>
Date: Tue, 9 Feb 2021 11:13:07 +0100
Subject: [PATCH] [windows] split python installation off into its own block
---
windows/base/Dockerfile | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/windows/base/Dockerfile b/windows/base/Dockerfile
index 36cce7a..d7efd7d 100644
--- a/windows/base/Dockerfile
+++ b/windows/base/Dockerfile
@@ -20,11 +20,7 @@ RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tl
curl \
7zip \
wixtoolset; \
- Must-Run choco install -y --allow-multiple-versions python --version 3.8.7; \
- Must-Run choco install -y --allow-multiple-versions python --version 3.7.9; \
$env:PATH = "\"$([Environment]::GetEnvironmentVariable('PATH', [EnvironmentVariableTarget]::User));$([Environment]::GetEnvironmentVariable('PATH', [EnvironmentVariableTarget]::Machine))\""; \
- Must-Run /Python38/python -m pip --no-cache-dir install --no-warn-script-location wheel; \
- Must-Run /Python37/python -m pip --no-cache-dir install --no-warn-script-location wheel; \
Must-Run choco install -y visualstudio2017buildtools; \
Must-Run choco install -y visualstudio2017-workload-vctools; \
Start-Process "\"C:/Program Files (x86)/Microsoft Visual Studio/Installer/vs_installer.exe\"" -NoNewWindow -Wait -ArgumentList 'modify --installPath \"C:/Program Files (x86)/Microsoft Visual Studio/2017/BuildTools\" --quiet --norestart --remove Microsoft.VisualStudio.Component.VC.CMake.Project --add Microsoft.VisualStudio.Component.VC.Tools.14.16 --add Microsoft.VisualStudio.Component.VC.ATL'
@@ -89,3 +85,9 @@ RUN cd $env:VCPKG_DIR; \
Remove-Item -Force -Recurse ./downloads; \
Remove-Item -Force -Recurse ./buildtrees; \
Remove-Item -Force -Recurse ./packages;
+
+RUN Must-Run choco install -y --allow-multiple-versions python --version 3.8.7; \
+ Must-Run choco install -y --allow-multiple-versions python --version 3.7.9; \
+ $env:PATH = "\"$([Environment]::GetEnvironmentVariable('PATH', [EnvironmentVariableTarget]::User));$([Environment]::GetEnvironmentVariable('PATH', [EnvironmentVariableTarget]::Machine))\""; \
+ Must-Run /Python38/python -m pip --no-cache-dir install --no-warn-script-location wheel; \
+ Must-Run /Python37/python -m pip --no-cache-dir install --no-warn-script-location wheel
--
GitLab