Create first-pass Cobalt Console Images for VS2022

b/265873968 Change-Id: I0f9ad19f3b4dd7120a0398eafd598ca3ecc327ed NOKEYCHECK=True GitOrigin-RevId: 773a9c17d2881a01d72fa7adbab0318bc3f7d4c5
mingchou · Mar 23, 2023 · 00f0d14 · 00f0d14
1 parent 91837e8
commit 00f0d14
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/docker-compose-windows.yml b/docker-compose-windows.yml
@@ -52,6 +52,15 @@ services:
     image: visual-studio-base
     scale: 0
 
+  visual-studio-2022-base:
+    build:
+      context: ./docker/windows/base/visualstudio2022
+      dockerfile: ./Dockerfile
+      args:
+        - FROM_IMAGE=mcr.microsoft.com/windows/servercore:ltsc2019
+    image: visual-studio-2022-base
+    scale: 0
+
   visual-studio-win32-base:
     build:
       context: ./docker/windows/base/visualstudio2017
@@ -85,6 +94,17 @@ services:
     depends_on:
       - visual-studio-base
 
+  cobalt-build-vs2022-win-base:
+    build:
+      context: ./docker/windows/base/build
+      dockerfile: ./Dockerfile
+      args:
+        - FROM_IMAGE=visual-studio-2022-base
+    image: cobalt-build-vs2022-win-base
+    scale: 0
+    depends_on:
+      - visual-studio-2022-base
+
   cobalt-build-win32-base:
     build:
       context: ./docker/windows/base/build

diff --git a/docker/windows/base/visualstudio2022/Dockerfile b/docker/windows/base/visualstudio2022/Dockerfile
@@ -32,6 +32,8 @@ RUN Write-Host ('Installing vs_buildtools.exe');`
         --installPath C:\BuildTools `
         --add Microsoft.VisualStudio.Component.VC.CoreIde `
         --add Microsoft.VisualStudio.Component.VC.14.34.17.4.x86.x64 `
+        --add Microsoft.VisualStudio.Component.VC.Llvm.Clang `
+        --add Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset `
         --add Microsoft.VisualStudio.Component.Windows10SDK.18362';`
     Write-Host ('Cleaning up vs_buildtools.exe');`
     Remove-Item -Force -Recurse ${env:ProgramFiles(x86)}\'Microsoft Visual Studio'\Installer;`