From 11fd543f69cf0a834a0b2853dab2964f3a935494 Mon Sep 17 00:00:00 2001
From: cobalt-github-releaser-bot
 <95661244+cobalt-github-releaser-bot@users.noreply.github.com>
Date: Tue, 27 Jun 2023 16:30:09 -0700
Subject: [PATCH] Cherry pick PR #450: Enable VS 2022 Images to build PS4/5
 (#761)

b/265873968
b/282188909

(cherry picked from commit 445f6e630829f91ea063d31cf9fe3d9a1de3a8a1)

Co-authored-by: Arjun Menon <agmenon@google.com>
---
 docker-compose-windows-internal.yml  | 6 +++++-
 docker-compose-windows.yml           | 3 ++-
 docker/windows/base/build/Dockerfile | 1 +
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/docker-compose-windows-internal.yml b/docker-compose-windows-internal.yml
index 5e4cba3b20ddb..bccb3b6ee2b6c 100644
--- a/docker-compose-windows-internal.yml
+++ b/docker-compose-windows-internal.yml
@@ -27,7 +27,7 @@ x-common-definitions: &common-definitions
   volumes:
     - ${COBALT_SRC:-.}:c:/code/
     - ${SCCACHE_DIR:-container-sccache}:c:/root/sccache/
-  cpus: ${DOCKER_CPUS:-12}
+  cpus: ${DOCKER_CPUS:-20}
   mem_limit: ${DOCKER_MEMLIMIT:-100000M}
 
 x-shared-build-env: &shared-build-env
@@ -142,6 +142,7 @@ services:
     environment:
       <<: *shared-build-env
       PLATFORM: ps4
+      VISUAL_STUDIO_VERSION: "2022"
     image: cobalt-build-ps4
     depends_on:
       - cobalt-build-vs2022-win-internal
@@ -157,6 +158,7 @@ services:
     environment:
       <<: *shared-build-env
       PLATFORM: ps5
+      VISUAL_STUDIO_VERSION: "2022"
     image: cobalt-build-ps5
     depends_on:
       - cobalt-build-vs2022-win-internal
@@ -173,6 +175,7 @@ services:
       <<: *shared-build-env
       PLATFORM: xb1
       COBALT_CONCURRENT_LINKS: ${COBALT_CONCURRENT_LINKS:-1}
+      VISUAL_STUDIO_VERSION: "2022"
     image: cobalt-build-xb1
     depends_on:
       - cobalt-build-vs2022-win-internal
@@ -188,6 +191,7 @@ services:
     environment:
       <<: *shared-build-env
       PLATFORM: nxswitch
+      VISUAL_STUDIO_VERSION: "2022"
     image: cobalt-build-nxswitch
     depends_on:
       - cobalt-build-vs2022-win-internal
diff --git a/docker-compose-windows.yml b/docker-compose-windows.yml
index 9d62c111ed18a..3c12694ea6261 100644
--- a/docker-compose-windows.yml
+++ b/docker-compose-windows.yml
@@ -23,7 +23,7 @@ x-common-definitions: &common-definitions
   volumes:
     - ${COBALT_SRC:-.}:c:/code/
     - ${SCCACHE_DIR:-container-sccache}:c:/root/sccache/
-  cpus: ${DOCKER_CPUS:-12}
+  cpus: ${DOCKER_CPUS:-20}
   mem_limit: ${DOCKER_MEMLIMIT:-100000M}
 
 x-shared-build-env: &shared-build-env
@@ -168,6 +168,7 @@ services:
     environment:
       <<: *shared-build-env
       PLATFORM: win-win32
+      VISUAL_STUDIO_VERSION: "2022"
     image: cobalt-build-win32-vs2022
 
   runner-win-win32:
diff --git a/docker/windows/base/build/Dockerfile b/docker/windows/base/build/Dockerfile
index 9abaf7bd94401..1952773db5ef0 100644
--- a/docker/windows/base/build/Dockerfile
+++ b/docker/windows/base/build/Dockerfile
@@ -59,6 +59,7 @@ RUN mkdir C:\pip-cache;`
     git config --global core.filemode false;`
     git config --global core.preloadindex true;`
     git config --global core.fscache true;`
+    git config --global --add safe.directory C:/code;`
     # Registry changes to enable long filesystem paths.
     reg add 'HKLM\SYSTEM\CurrentControlSet\Control\FileSystem' /v LongPathsEnabled /t REG_DWORD /reg:64 /d 1 /f;`
     reg add 'HKLM\SYSTEM\CurrentControlSet\Control\FileSystem' /v LongPathsEnabled /t REG_DWORD /d 1 /f;`