Cherry pick PR #4141: [Docker] Fix base container alias (#4143)

Refer to the original PR: #4141 Switches the container base image url to a supported alias. b/369130578 --------- Co-authored-by: Kaido Kert <[email protected]>
youtube · Sep 23, 2024 · b41f909 · b41f909
1 parent 9d5c683
commit b41f909
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git 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:

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}
 
 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,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