diff --git a/docker/windows-release-builder.Dockerfile b/docker/windows-release-builder.Dockerfile index fee1fe5..ef2b61f 100644 --- a/docker/windows-release-builder.Dockerfile +++ b/docker/windows-release-builder.Dockerfile @@ -10,17 +10,22 @@ FROM mcr.microsoft.com/windows/servercore:10.0.26100.7171 # Restore the default Windows shell for correct batch processing. SHELL ["cmd", "/S", "/C"] + RUN ` - set LOGFILE=C:\vsinstall.log ` - && curl -SL --output vs_buildtools.exe https://aka.ms/vs/17/release/vs_buildtools.exe ` + curl -SL --output vs_buildtools.exe https://aka.ms/vs/17/release/vs_buildtools.exe ` + ` && (start /w vs_buildtools.exe --quiet --wait --norestart --nocache ` --installPath "%ProgramFiles(x86)%\Microsoft Visual Studio\2022\BuildTools" ` --add Microsoft.VisualStudio.Workload.NativeDesktop ` - --log "%LOGFILE%" ` || IF "%ERRORLEVEL%"=="3010" EXIT 0) ` - && type "%LOGFILE%" ` - && del /q vs_buildtools.exe ` - && del /q "%LOGFILE%" + ` + REM Echo any Visual Studio installer logs from %TEMP% to Docker output ` + && for %F in ("%TEMP%\dd_*.log") do @echo ===== %F ===== & type "%F" ` + ` + REM Optional: delete the logs to save space ` + && del /Q "%TEMP%\dd_*.log" ` + ` + && del /Q vs_buildtools.exe # Define the entry point for the docker container. # This entry point starts the developer command prompt and launches the PowerShell shell.