[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 24, 2024 · 17efee4 · 17efee4
1 parent d431116
commit 17efee4
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 12 deletions.
diff --git 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
@@ -17,8 +17,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
 
@@ -102,8 +103,9 @@ services:
       CONFIG: ${CONFIG:-debug}
 
   linux-x64x11-xenial:
-    <<: *common-definitions
-    <<: *build-volumes
+    <<:
+      - *common-definitions
+      - *build-volumes
     build:
       context: ./docker/linux
       dockerfile: linux-x64x11/Dockerfile
@@ -115,8 +117,9 @@ services:
     scale: 0
 
   linux-x64x11-clang-3-6:
-    <<: *common-definitions
-    <<: *build-volumes
+    <<:
+      - *common-definitions
+      - *build-volumes
     build:
       context: ./docker/linux/
       dockerfile: clang-3-6/Dockerfile
@@ -236,7 +239,7 @@ services:
     environment:
       <<: *shared-build-env
       PLATFORM: evergreen-arm-softfp-sbversion-12
-  
+
   build-linux-evergreen:
     <<: *build-common-definitions
     build:
@@ -248,7 +251,7 @@ services:
     depends_on: [ build-evergreen ]
     environment:
       <<: *shared-build-env
-  
+
   unittest:
     <<: *common-definitions
     build:

diff --git a/docker/linux/android/Dockerfile b/docker/linux/android/Dockerfile
@@ -1,7 +1,7 @@
 FROM cobalt-build-base
 
 RUN apt update -qqy \
-    && apt install -qqy --no-install-recommends \
+    && apt install -qqy \
         binutils \
         bison \
         default-jdk \

diff --git a/docker/linux/base/Dockerfile b/docker/linux/base/Dockerfile
@@ -1,6 +1,6 @@
 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