From d8ca8bd47c82556fdc5d20386e775c7b8c5cda2a Mon Sep 17 00:00:00 2001
From: Kaido Kert <kaidokert@google.com>
Date: Mon, 23 Sep 2024 10:54:16 -0700
Subject: [PATCH 1/3] [Docker] Fix base container alias (#4141)

Switches the container base image url to a supported alias.

b/369130578

(cherry picked from commit 6c55b73523a37caee3c54a6af226ad73ae14aff4)
---
 .github/actions/docker/action.yaml |  7 +++++--
 docker-compose.yml                 | 15 +++++++++------
 docker/linux/base/Dockerfile       |  2 +-
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/.github/actions/docker/action.yaml b/.github/actions/docker/action.yaml
index 8cb7fe9e691e..06692a0cb568 100644
--- a/.github/actions/docker/action.yaml
+++ b/.github/actions/docker/action.yaml
@@ -47,8 +47,11 @@ runs:
       run: echo "DOCKER_TAG=ghcr.io/${REPO}/${{inputs.docker_image}}:${GITHUB_BASE_REF%.1+}" >> $GITHUB_ENV
       shell: bash
     - name: Set up Cloud SDK
-      if: ${{ (steps.changed-files.outputs.any_changed == 'true') && (github.event_name == 'pull_request') && (github.event.pull_request.head.repo.fork) }}
-      uses: google-github-actions/setup-gcloud@v1
+      uses: isarkis/setup-gcloud@40dce7857b354839efac498d3632050f568090b6 # v1.1.1
+    - name: Configure Docker auth for GCloud
+      shell: bash
+      run: |
+        gcloud auth configure-docker
     - name: Set Docker Tag
       id: set-docker-tag-presubmit-fork
       env:
diff --git a/docker-compose.yml b/docker-compose.yml
index 125a4fc25371..50c188e56f53 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -31,8 +31,9 @@ x-build-volumes: &build-volumes
     - ${STARBOARD_TOOLCHAINS_DIR:-container-starboard-toolchains}:/root/starboard-toolchains
 
 x-build-common-definitions: &build-common-definitions
-  <<: *common-definitions
-  <<: *build-volumes
+  <<:
+    - *common-definitions
+    - *build-volumes
   depends_on:
     - build-base
 
@@ -150,8 +151,9 @@ services:
       CONFIG: ${CONFIG:-debug}
 
   linux-x64x11-xenial:
-    <<: *common-definitions
-    <<: *build-volumes
+    <<:
+      - *common-definitions
+      - *build-volumes
     build:
       context: ./docker/linux
       dockerfile: linux-x64x11/Dockerfile
@@ -163,8 +165,9 @@ services:
     scale: 0
 
   linux-x64x11-clang-3-9:
-    <<: *common-definitions
-    <<: *build-volumes
+    <<:
+      - *common-definitions
+      - *build-volumes
     build:
       context: ./docker/linux/
       dockerfile: clang-3-9/Dockerfile
diff --git a/docker/linux/base/Dockerfile b/docker/linux/base/Dockerfile
index 07c34a0dc5e7..ae7ca7386574 100644
--- a/docker/linux/base/Dockerfile
+++ b/docker/linux/base/Dockerfile
@@ -14,7 +14,7 @@
 
 ARG BASE_OS
 ARG BASE_OS_TAG
-FROM ${BASE_OS:-gcr.io/cloud-marketplace-containers/google/debian10}:${BASE_OS_TAG:-latest}
+FROM ${BASE_OS:-marketplace.gcr.io/google/debian10}:${BASE_OS_TAG:-latest}
 
 ENV PYTHONUNBUFFERED 1
 

From 76ad591c765a5368a96bcbd9a5a67b10aab0b472 Mon Sep 17 00:00:00 2001
From: Kaido Kert <kaidokert@google.com>
Date: Mon, 23 Sep 2024 18:42:17 -0700
Subject: [PATCH 2/3] Fix broken yaml

---
 docker-compose.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 50c188e56f53..a9fa22ad9c83 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -180,8 +180,9 @@ services:
       - linux-x64x11-xenial
 
   linux-x64x11-clang-3-9-prebuilt:
-    <<: *common-definitions
-    <<: *build-volumes
+    <<: 
+      - *common-definitions
+      - *build-volumes
     image: gcr.io/cobalt-tools/build-cobalt-linux-x64x11-clang-3-9:1.4
     environment:
       <<: *shared-build-env

From d17a6fbbfaf73ae05f609e23f86ab5ffcc625f9b Mon Sep 17 00:00:00 2001
From: Kaido Kert <kaidokert@google.com>
Date: Mon, 23 Sep 2024 18:59:15 -0700
Subject: [PATCH 3/3] Fix Android java install

---
 docker/linux/android/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/linux/android/Dockerfile b/docker/linux/android/Dockerfile
index 5624b660159b..371a3379a9eb 100644
--- a/docker/linux/android/Dockerfile
+++ b/docker/linux/android/Dockerfile
@@ -15,7 +15,7 @@
 FROM cobalt-build-base
 
 RUN apt update -qqy \
-    && apt install -qqy --no-install-recommends \
+    && apt install -qqy \
         default-jdk \
         g++-multilib \
         libxml2-dev \