File tree Expand file tree Collapse file tree 4 files changed +36
-3
lines changed
tests/ci/docker_images/windows Expand file tree Collapse file tree 4 files changed +36
-3
lines changed Original file line number Diff line number Diff line change 66Invoke-Command { docker build - t aws- lc/ windows- 2022 :base .\windows- 2022_base }
77Invoke-Command { docker build - t windows- 2022 :vs2015 .\windows- 2022_vs2015 }
88Invoke-Command { docker build - t windows- 2022 :vs2017 .\windows- 2022_vs2017 }
9+ Invoke-Command { docker build - t windows- 2022 :vs2019 .\windows- 2022_vs2019 }
910Invoke-Command { docker build - t windows- 2022 :vs2022 .\windows- 2022_vs2022 }
Original file line number Diff line number Diff line change @@ -14,4 +14,5 @@ Write-Host "$ECS_REPO"
1414
1515Tag- And- Push-Image " windows-2022:vs2015" " ${ECS_REPO} :windows-2022_vs2015"
1616Tag- And- Push-Image " windows-2022:vs2017" " ${ECS_REPO} :windows-2022_vs2017"
17+ Tag- And- Push-Image " windows-2022:vs2019" " ${ECS_REPO} :windows-2022_vs2019"
1718Tag- And- Push-Image " windows-2022:vs2022" " ${ECS_REPO} :windows-2022_vs2022"
Original file line number Diff line number Diff line change @@ -27,10 +27,13 @@ RUN `
2727# Add msbuild and cl to PATH
2828RUN setx /M PATH "%PATH%;C:\P rogram Files (x86)\M SBuild\1 4.0\b in;C:\P rogram Files (x86)\M icrosoft Visual Studio 14.0\V C\b in"
2929
30- # Replace Windows SDK with the correct binary path. vcvarsall.bat for MSVC2015 does not account for the nested directory.
30+ # Dynamically get the installed SDK version
31+ RUN for /f "tokens=*" %a in ('dir /b /ad "C:\P rogram Files (x86)\W indows Kits\1 0\I nclude\1 0.0*"' ) do setx /M SDKVERSION %a
32+
33+ # Replace Windows SDK with the correct binary path. vcvarsall.bat for MSVC2015 does not account for the nested directory
3134RUN rmdir /s /Q "C:\P rogram Files (x86)\W indows Kits\1 0\b in\x 64" && `
3235 rmdir /s /Q "C:\P rogram Files (x86)\W indows Kits\1 0\b in\x 86" && `
33- move "C:\P rogram Files (x86)\W indows Kits\1 0\b in\1 0.0.17763.0 \x 64" "C:\P rogram Files (x86)\W indows Kits\1 0\b in" && `
34- move "C:\P rogram Files (x86)\W indows Kits\1 0\b in\1 0.0.17763.0 \x 86" "C:\P rogram Files (x86)\W indows Kits\1 0\b in"
36+ move "C:\P rogram Files (x86)\W indows Kits\1 0\b in\% SDKVERSION% \x 64" "C:\P rogram Files (x86)\W indows Kits\1 0\b in" && `
37+ move "C:\P rogram Files (x86)\W indows Kits\1 0\b in\% SDKVERSION% \x 86" "C:\P rogram Files (x86)\W indows Kits\1 0\b in"
3538
3639CMD [ "cmd.exe" ]
Original file line number Diff line number Diff line change 1+ # escape=`
2+
3+ # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
4+ # SPDX-License-Identifier: Apache-2.0 OR ISC
5+
6+ # Keep parity with the upstream tags at https://hub.docker.com/_/microsoft-windows-servercore
7+ FROM aws-lc/windows-2022:base
8+
9+ SHELL ["cmd" , "/S" , "/C" ]
10+ RUN `
11+ # Download the Build Tools bootstrapper.
12+ curl -SL --output vs_buildtools.exe https://aka.ms/vs/16/release/vs_buildtools.exe `
13+ `
14+ # Install MSVC2019 Build Tools with Windows SDK
15+ && (start /w vs_buildtools.exe --quiet --wait --norestart --nocache `
16+ --add Microsoft.VisualStudio.Workload.VCTools `
17+ --add Microsoft.VisualStudio.Component.VC.CLI.Support `
18+ --add Microsoft.VisualStudio.Component.VC.CMake.Project `
19+ --add Microsoft.VisualStudio.Component.Windows10SDK.19041 `
20+ --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 `
21+ || IF "%ERRORLEVEL%" =="3010" EXIT 0) `
22+ `
23+ # Cleanup
24+ && del /q vs_buildtools.exe
25+
26+ RUN setx /M PATH "%PATH%;C:\P rogram Files (x86)\M icrosoft Visual Studio\2 017\B uildTools\M SBuild\1 5.0\B in"
27+
28+ CMD [ "cmd.exe" ]
You can’t perform that action at this time.
0 commit comments