From 04f2a6bb936bf9acbfbf27c4fe222bca5e8557c7 Mon Sep 17 00:00:00 2001 From: Lisanna Dettwyler Date: Tue, 19 Nov 2024 20:50:01 +0000 Subject: [PATCH] Fix buggy windows container symlink in Dockerfile Symlinks in windows containers sometimes cause filesystem issues. Signed-off-by: Lisanna Dettwyler --- .github/docker/windows.Dockerfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/docker/windows.Dockerfile b/.github/docker/windows.Dockerfile index fe251268..beae0c30 100644 --- a/.github/docker/windows.Dockerfile +++ b/.github/docker/windows.Dockerfile @@ -25,9 +25,8 @@ RUN (start /w vs_buildtools.exe --quiet --wait --norestart --nocache ` --add Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre ` || IF "%ERRORLEVEL%"=="3010" EXIT 0) ` && del /q vs_buildtools.exe ` - && mklink /d "C:\Program Files (x86)\Microsoft Visual Studio\current" "C:\Program Files (x86)\Microsoft Visual Studio\%VS_VERSION%" ` - && if not exist "C:\Program Files (x86)\Microsoft Visual Studio\%VS_VERSION%\BuildTools\Common7\Tools\VsDevCmd.bat" exit 1 -ENTRYPOINT ["C:\\Program Files (x86)\\Microsoft Visual Studio\\current\\BuildTools\\VC\\Auxiliary\\Build\\vcvars64.bat", "&&"] + && if not exist "C:\Program Files (x86)\Microsoft Visual Studio\%VS_VERSION%\BuildTools\VC\Auxiliary\Build\vcvars64.bat" exit 1 +ENTRYPOINT ["C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\VC\\Auxiliary\\Build\\vcvars64.bat", "&&"] SHELL ["powershell"] ENV chocolateyUseWindowsCompression false @@ -35,7 +34,7 @@ RUN Set-ExecutionPolicy Bypass -Scope Process -Force; ` [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; ` iex ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1')) SHELL ["cmd", "/S", "/C"] -RUN call "%ProgramFiles(x86)%\Microsoft Visual Studio\current\BuildTools\VC\Auxiliary\Build\vcvars64.bat" && ` +RUN call "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvars64.bat" && ` powershell -command "[Environment]::SetEnvironmentVariable('Path', $env:Path, [System.EnvironmentVariableTarget]::Machine)" RUN choco feature disable --name showDownloadProgress && ` choco install -y --fail-on-error-output git -params '"/GitAndUnixToolsOnPath"' && `