From 2bd462d2687c8603d318b593a52722082046efca Mon Sep 17 00:00:00 2001
From: Kaido Kert <kaidokert@google.com>
Date: Mon, 23 Sep 2024 09:29:07 -0700
Subject: [PATCH 1/3] [Docker] Fix base container alias

Switches the container base image url to a supported alias.

b/369130578
---
 cobalt/site/docker/Dockerfile | 2 +-
 docker/linux/base/Dockerfile  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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/linux/base/Dockerfile b/docker/linux/base/Dockerfile
index 16f060aec3aa..66bb1f5e8998 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/debian11}:${BASE_OS_TAG:-latest}
+FROM ${BASE_OS:-marketplace.gcr.io/google/debian11}:${BASE_OS_TAG:-latest}
 
 COPY base/clean-after-apt.sh /opt/clean-after-apt.sh
 

From ca83e71c6630841e4e9031a8bc8d9cd7aced5878 Mon Sep 17 00:00:00 2001
From: Kaido Kert <kaidokert@google.com>
Date: Mon, 23 Sep 2024 10:09:57 -0700
Subject: [PATCH 2/3] Try gcloud auth config-docker

---
 .github/actions/docker/action.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/actions/docker/action.yaml b/.github/actions/docker/action.yaml
index 2880521fd45e..10e7f3fc7bdb 100644
--- a/.github/actions/docker/action.yaml
+++ b/.github/actions/docker/action.yaml
@@ -76,6 +76,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

From be642ce54f4237cb557111051816c473eac7dcf8 Mon Sep 17 00:00:00 2001
From: Kaido Kert <kaidokert@google.com>
Date: Mon, 23 Sep 2024 10:20:51 -0700
Subject: [PATCH 3/3] Fix ubuntu18 images

---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index eeb249b6d286..e921835a51f9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -113,7 +113,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