Skip to content

Commit 8e17e09

Browse files
[NFC][lldb][windows] remove unneeded files from the docker image (#575)
1 parent 4dbeec9 commit 8e17e09

1 file changed

Lines changed: 6 additions & 10 deletions

File tree

swift-ci/main/windows/lldb/1809/Dockerfile

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,12 @@ RUN Invoke-WebRequest -Uri https://aka.ms/vs/17/release/vs_buildtools.exe -OutFi
1414
Start-Process -FilePath .\\vs_buildtools.exe -Wait -ArgumentList \
1515
'--quiet --wait --norestart \
1616
--add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 \
17-
--add Microsoft.VisualStudio.Component.VC.Tools.ARM64 \
18-
--add Microsoft.VisualStudio.Component.VC.14.44.17.14.ARM64 \
19-
--add Microsoft.VisualStudio.Component.VC.14.44.17.14.x86.x64 \
2017
--add Microsoft.VisualStudio.Component.VC.ATL \
21-
--add Microsoft.VisualStudio.Component.VC.ATL.ARM64 \
22-
--add Microsoft.VisualStudio.Component.Windows10SDK \
2318
--add Microsoft.VisualStudio.Component.Windows11SDK.22621 \
24-
--add Microsoft.VisualStudio.Component.VC.CMake.Project \
2519
--add Microsoft.NetCore.Component.Runtime.9.0'; \
26-
Remove-Item -Force vs_buildtools.exe
20+
Remove-Item -Force vs_buildtools.exe; \
21+
Remove-Item -Recurse -Force 'C:\\ProgramData\\Package Cache' -ErrorAction SilentlyContinue; \
22+
Remove-Item -Recurse -Force "$env:TEMP\\*" -ErrorAction SilentlyContinue
2723

2824
# Git
2925
RUN Invoke-WebRequest -Uri https://github.com/git-for-windows/git/releases/download/v2.47.1.windows.1/Git-2.47.1-64-bit.exe -OutFile git.exe; \
@@ -68,11 +64,11 @@ RUN Invoke-WebRequest -Uri https://downloads.sourceforge.net/project/ezwinports/
6864

6965
# vcpkg + libxml2
7066
RUN git clone --depth 1 https://github.com/microsoft/vcpkg C:\\vcpkg; \
71-
C:\\vcpkg\\bootstrap-vcpkg.bat -disableMetrics
67+
C:\\vcpkg\\bootstrap-vcpkg.bat -disableMetrics; \
68+
Remove-Item -Recurse -Force C:\\vcpkg\\.git
7269
SHELL ["cmd", "/S", "/C"]
73-
RUN ""C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Auxiliary\Build\vcvars64.bat" && C:\vcpkg\vcpkg install libxml2:x64-windows"
70+
RUN ""C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Auxiliary\Build\vcvars64.bat" && C:\vcpkg\vcpkg install libxml2:x64-windows && rmdir /S /Q C:\vcpkg\buildtrees && rmdir /S /Q C:\vcpkg\packages && rmdir /S /Q C:\vcpkg\downloads"
7471
SHELL ["powershell", "-ExecutionPolicy", "Bypass", "-Command"]
75-
RUN Remove-Item -Recurse -Force C:\\vcpkg\\buildtrees, C:\\vcpkg\\packages, C:\\vcpkg\\downloads
7672
RUN [Environment]::SetEnvironmentVariable('VCPKG_ROOT', 'C:\\vcpkg', [EnvironmentVariableTarget]::Machine); \
7773
[Environment]::SetEnvironmentVariable('PATH', $env:PATH + ';C:\\vcpkg\\installed\\x64-windows\\bin', [EnvironmentVariableTarget]::Machine)
7874

0 commit comments

Comments
 (0)