[Docker] Fix base container alias (#4141)

Switches the container base image url to a supported alias. b/369130578 (cherry picked from commit 6c55b73)
youtube · Sep 23, 2024 · e120918 · e120918
1 parent 9d5c683
commit e120918
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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
@@ -14,7 +14,11 @@
 
 ARG BASE_OS
 ARG BASE_OS_TAG
+<<<<<<< HEAD
 FROM ${BASE_OS:-gcr.io/cloud-marketplace-containers/google/debian10}:${BASE_OS_TAG:-latest}
+=======
+FROM ${BASE_OS:-marketplace.gcr.io/google/debian11}:${BASE_OS_TAG:-latest}
+>>>>>>> 6c55b73523a ([Docker] Fix base container alias (#4141))
 
 COPY base/clean-after-apt.sh /opt/clean-after-apt.sh