File tree Expand file tree Collapse file tree 2 files changed +7
-6
lines changed
scripts/resources/windows Expand file tree Collapse file tree 2 files changed +7
-6
lines changed Original file line number Diff line number Diff line change @@ -19,7 +19,7 @@ ARG chocolateyVersion
1919FROM ${FROM_IMAGE} AS certsgen
2020RUN certutil -generateSSTFromWU roots.sst
2121
22- FROM ${FROM_IMAGE} AS CHOCOLATEY_BASE
22+ FROM ${FROM_IMAGE} AS chocolatey_base
2323
2424SHELL ["powershell" , "-Command" , "$ErrorActionPreference = 'Stop';" ]
2525
@@ -59,13 +59,13 @@ RUN C:\ProgramData\chocolatey\bin\choco.exe sources ; `
5959 { `
6060 throw 'nasm.exe not found' ; `
6161 }; `
62+ uv python update-shell ; `
6263 Write-Host "Finished install packages with Chocolatey"
6364
64-
6565RUN New-ItemProperty -Path "HKLM:\S YSTEM\C urrentControlSet\C ontrol\F ileSystem" `
6666 -Name "LongPathsEnabled" -Value 1 -PropertyType DWORD -Force
6767
68- FROM CHOCOLATEY_BASE AS CONAN_BUILDER
68+ FROM chocolatey_base AS conan_builder
6969ARG CONAN_HOME
7070
7171ARG PIP_INDEX_URL
@@ -96,14 +96,14 @@ RUN uvx --with cmake conan profile detect --exist-ok ; `
9696 }
9797# ==============================================================================
9898
99- FROM CHOCOLATEY_BASE
99+ FROM chocolatey_base
100100COPY --from=certsgen c:/roots.sst roots.sst
101101RUN certutil -addstore -f root roots.sst ; `
102102 del roots.sst
103103
104104ARG CONAN_USER_HOME
105105ARG CONAN_HOME
106- COPY --from=CONAN_BUILDER ${CONAN_HOME}/ ${CONAN_HOME}/
106+ COPY --from=conan_builder ${CONAN_HOME}/ ${CONAN_HOME}/
107107ARG UV_CACHE_DIR
108108ARG PIP_DOWNLOAD_CACHE
109109
Original file line number Diff line number Diff line change 22 "version" : " 1.0" ,
33 "components" : [
44 " Microsoft.VisualStudio.Component.VC.Tools.x86.x64" ,
5- " Microsoft.VisualStudio.Component.Windows10SDK.18362"
5+ " Microsoft.VisualStudio.ComponentGroup.VC.Tools.142.x86.x64" ,
6+ " Microsoft.VisualStudio.Component.Windows10SDK.19041"
67 ],
78 "extensions" : []
89}
You can’t perform that action at this time.
0 commit comments