From 4775af112d39150d6000bcb7f7bcda2cced531fb 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/2] [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 | 1 +
 cobalt/site/docker/Dockerfile      | 2 +-
 docker-compose.yml                 | 2 +-
 docker/linux/base/Dockerfile       | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/actions/docker/action.yaml b/.github/actions/docker/action.yaml
index 7a1073a7da05..2220513c3824 100644
--- a/.github/actions/docker/action.yaml
+++ b/.github/actions/docker/action.yaml
@@ -66,6 +66,7 @@ runs:
         ACCESS_TOKEN=$(curl -H 'Metadata-Flavor: Google' ${SVC_ACCT}/token | cut -d'"' -f 4)
         printf ${ACCESS_TOKEN} | docker login -u oauth2accesstoken --password-stdin https://gcr.io
         echo "DOCKER_TAG=gcr.io/${PROJECT_NAME}/${{inputs.docker_image}}:pr-${GITHUB_EVENT_NUMBER}" >> $GITHUB_ENV
+        gcloud auth configure-docker
       shell: bash
     - name: Process Docker metadata
       id: process-docker-metadata
diff --git a/cobalt/site/docker/Dockerfile b/cobalt/site/docker/Dockerfile
index 1acba94d9995..90bd6358e18d 100644
--- a/cobalt/site/docker/Dockerfile
+++ b/cobalt/site/docker/Dockerfile
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 ARG FROM_IMAGE
-FROM ${FROM_IMAGE:-gcr.io/cloud-marketplace-containers/google/debian11}
+FROM ${FROM_IMAGE:-marketplace.gcr.io/google/debian11:latest}
 
 RUN apt update -qqy \
     && apt install -qqy --no-install-recommends \
diff --git a/docker-compose.yml b/docker-compose.yml
index 09d874cdbd72..5b52a2d9aee2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -95,7 +95,7 @@ services:
   base-bionic:
     build:
       args:
-        - BASE_OS=gcr.io/cloud-marketplace-containers/google/ubuntu1804
+        - BASE_OS=marketplace.gcr.io/google/ubuntu1804
         - BASE_OS_TAG=latest
       context: ./docker/linux
       dockerfile: base/Dockerfile
diff --git a/docker/linux/base/Dockerfile b/docker/linux/base/Dockerfile
index 051fa242f45c..1750b1472b10 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}
 
 COPY base/clean-after-apt.sh /opt/clean-after-apt.sh
 

From 4a7de2e5abdfee7b522f8e608e3092b7976b980d Mon Sep 17 00:00:00 2001
From: cobalt-github-releaser-bot
 <95661244+cobalt-github-releaser-bot@users.noreply.github.com>
Date: Mon, 23 Sep 2024 12:34:06 -0700
Subject: [PATCH 2/2] Cherry pick PR #4141: [Docker] Fix base container alias
 (#4142)

Refer to the original PR: https://github.com/youtube/cobalt/pull/4141

Switches the container base image url to a supported alias.

b/369130578

---------

Co-authored-by: Kaido Kert <kaidokert@google.com>
---
 .github/actions/docker/action.yaml | 6 ++++--
 cobalt/site/docker/Dockerfile      | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/actions/docker/action.yaml b/.github/actions/docker/action.yaml
index 2220513c3824..d2adc95c4d4b 100644
--- a/.github/actions/docker/action.yaml
+++ b/.github/actions/docker/action.yaml
@@ -51,8 +51,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: 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:
@@ -66,7 +69,6 @@ runs:
         ACCESS_TOKEN=$(curl -H 'Metadata-Flavor: Google' ${SVC_ACCT}/token | cut -d'"' -f 4)
         printf ${ACCESS_TOKEN} | docker login -u oauth2accesstoken --password-stdin https://gcr.io
         echo "DOCKER_TAG=gcr.io/${PROJECT_NAME}/${{inputs.docker_image}}:pr-${GITHUB_EVENT_NUMBER}" >> $GITHUB_ENV
-        gcloud auth configure-docker
       shell: bash
     - name: Process Docker metadata
       id: process-docker-metadata
diff --git a/cobalt/site/docker/Dockerfile b/cobalt/site/docker/Dockerfile
index 90bd6358e18d..748609a1d997 100644
--- a/cobalt/site/docker/Dockerfile
+++ b/cobalt/site/docker/Dockerfile
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 ARG FROM_IMAGE
-FROM ${FROM_IMAGE:-marketplace.gcr.io/google/debian11:latest}
+FROM ${FROM_IMAGE:-marketplace.gcr.io/google/debian11}
 
 RUN apt update -qqy \
     && apt install -qqy --no-install-recommends \