Skip to content

Commit 04f2a6b

Browse files
Fix buggy windows container symlink in Dockerfile
Symlinks in windows containers sometimes cause filesystem issues. Signed-off-by: Lisanna Dettwyler <[email protected]>
1 parent 16fffbb commit 04f2a6b

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

.github/docker/windows.Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,16 @@ RUN (start /w vs_buildtools.exe --quiet --wait --norestart --nocache `
2525
--add Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre `
2626
|| IF "%ERRORLEVEL%"=="3010" EXIT 0) `
2727
&& del /q vs_buildtools.exe `
28-
&& mklink /d "C:\Program Files (x86)\Microsoft Visual Studio\current" "C:\Program Files (x86)\Microsoft Visual Studio\%VS_VERSION%" `
29-
&& if not exist "C:\Program Files (x86)\Microsoft Visual Studio\%VS_VERSION%\BuildTools\Common7\Tools\VsDevCmd.bat" exit 1
30-
ENTRYPOINT ["C:\\Program Files (x86)\\Microsoft Visual Studio\\current\\BuildTools\\VC\\Auxiliary\\Build\\vcvars64.bat", "&&"]
28+
&& if not exist "C:\Program Files (x86)\Microsoft Visual Studio\%VS_VERSION%\BuildTools\VC\Auxiliary\Build\vcvars64.bat" exit 1
29+
ENTRYPOINT ["C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\VC\\Auxiliary\\Build\\vcvars64.bat", "&&"]
3130

3231
SHELL ["powershell"]
3332
ENV chocolateyUseWindowsCompression false
3433
RUN Set-ExecutionPolicy Bypass -Scope Process -Force; `
3534
[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; `
3635
iex ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1'))
3736
SHELL ["cmd", "/S", "/C"]
38-
RUN call "%ProgramFiles(x86)%\Microsoft Visual Studio\current\BuildTools\VC\Auxiliary\Build\vcvars64.bat" && `
37+
RUN call "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvars64.bat" && `
3938
powershell -command "[Environment]::SetEnvironmentVariable('Path', $env:Path, [System.EnvironmentVariableTarget]::Machine)"
4039
RUN choco feature disable --name showDownloadProgress && `
4140
choco install -y --fail-on-error-output git -params '"/GitAndUnixToolsOnPath"' && `

0 commit comments

Comments
 (0)