diff --git a/windows/Dockerfile b/windows/Dockerfile index a4c53bcf2b28a50207e49dfeff9e99be763758b8..17972feb2222029f88f3cda5157d3e2a4e4a6ddb 100644 --- a/windows/Dockerfile +++ b/windows/Dockerfile @@ -63,5 +63,4 @@ RUN python -m pip --no-cache-dir install --no-warn-script-location \ matplotlib \ pandas -COPY VsDevSh.ps1 C:/VsDevSh.ps1 -SHELL ["powershell", "-NoProfile", "-ExecutionPolicy Bypass", "-Command", "$ErrorActionPreference = 'Stop';", "C:/VsDevSh.ps1;"] \ No newline at end of file +COPY VsDevEnv.ps1 C:/VsDevEnv.ps1 \ No newline at end of file diff --git a/windows/VsDevSh.ps1 b/windows/VsDevEnv.ps1 similarity index 85% rename from windows/VsDevSh.ps1 rename to windows/VsDevEnv.ps1 index 8a59baf8a0c27fa9cdcec3097ea3323795c2c48a..649c7e88d8105c156c11a9fa4930c8c5a9644d97 100644 --- a/windows/VsDevSh.ps1 +++ b/windows/VsDevEnv.ps1 @@ -1,5 +1,5 @@ pushd "C:/Program Files (x86)/Microsoft Visual Studio/2017/BuildTools/Common7/Tools" -cmd /c "VsDevCmd.bat&set" | +cmd /c "VsDevCmd.bat $args & set" | foreach { if ($_ -match "=") { $v = $_.split("="); set-item -force -path "ENV:\$($v[0])" -value "$($v[1])"