Resolve conflicts

youtube · Sep 23, 2024 · 39f0117 · 39f0117
1 parent 05b4509
commit 39f0117
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/.github/actions/docker/action.yaml b/.github/actions/docker/action.yaml
@@ -46,8 +46,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:
@@ -61,7 +64,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/docker/docsite/Dockerfile b/docker/docsite/Dockerfile
@@ -13,15 +13,11 @@
 # limitations under the License.
 
 ARG FROM_IMAGE
-<<<<<<< HEAD:docker/docsite/Dockerfile
 FROM ${FROM_IMAGE:-cobalt-build-base}
 
 ARG USER
 ARG UID
 ARG GID
-=======
-FROM ${FROM_IMAGE:-marketplace.gcr.io/google/debian11:latest}
->>>>>>> 6c55b73523a ([Docker] Fix base container alias (#4141)):cobalt/site/docker/Dockerfile
 
 RUN apt update -qqy \
     && apt install -qqy --no-install-recommends \

diff --git a/docker/linux/base/Dockerfile b/docker/linux/base/Dockerfile
@@ -14,11 +14,7 @@
 
 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))
+FROM ${BASE_OS:-marketplace.gcr.io/google/debian10}:${BASE_OS_TAG:-latest}
 
 COPY base/clean-after-apt.sh /opt/clean-after-apt.sh