[Docker] Fix base container alias (#4141)

Switches the container base image url to a supported alias.

b/369130578

(cherry picked from commit 6c55b73)

.github/actions/docker/action.yaml

@@ -62,6 +62,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

cobalt/site/docker/Dockerfile

@@ -0,0 +1,66 @@
+# Copyright 2021 The Cobalt Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+ARG FROM_IMAGE
+FROM ${FROM_IMAGE:-marketplace.gcr.io/google/debian11:latest}
+
+RUN apt update -qqy \
+    && apt install -qqy --no-install-recommends \
+        curl \
+        ca-certificates \
+        doxygen \
+        git \
+        python3 \
+        unzip \
+    && apt-get clean autoclean \
+    && apt-get autoremove -y --purge \
+    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \
+    && rm -rf /var/lib/{apt,dpkg,cache,log}
+
+# Tell GN that we are building with Docker.
+ENV IS_DOCKER=1
+
+# Set python path for gn.
+ENV PYTHONPATH=/code
+
+# Mark the source directory safe.
+RUN git config --global --add safe.directory /code
+
+# === Get GN via CIPD
+ARG GN_SHA256SUM="af7b2dcb3905bca56655e12131b365f1cba8e159db80d2022330c4f522fab2ef  /tmp/gn.zip"
+ARG GN_HASH=r3styzkFvKVmVeEhMbNl8cuo4VnbgNICIzDE9SL6su8C
+RUN curl --location --silent --output /tmp/gn.zip \
+    "https://chrome-infra-packages.appspot.com/dl/gn/gn/linux-amd64/+/${GN_HASH}" \
+    && echo ${GN_SHA256SUM} | sha256sum --check \
+    && unzip /tmp/gn.zip -d /usr/local/bin \
+    && rm /tmp/gn.zip
+RUN chmod a+x /usr/local/bin/gn
+
+# We create and use a non-root user explicitly so that the generated and
+# modified files maintain the same permissions as the user that launched the
+# Docker container.
+ARG USER
+ARG UID
+ARG GID
+RUN addgroup --group --gid "${GID}" defaultgroup \
+    && adduser --disabled-password --gecos '' --uid "${UID}" --gid "${GID}" defaultuser
+
+# Create an out directory for gn. Its name is hardcoded in the docsite script.
+RUN mkdir /project_out_dir \
+    && chown ${USER:-defaultuser}:defaultgroup /project_out_dir
+
+# Once the directory has been created we can switch to the new user.
+USER ${USER:-defaultuser}
+
+CMD /code/cobalt/site/scripts/generate_site.py

docker-compose.yml

@@ -53,8 +53,13 @@ services:
   base-xenial:
     build:
       args:
+<<<<<<< HEAD
         - BASE_OS=ubuntu
         - BASE_OS_TAG=xenial
+=======
+        - BASE_OS=marketplace.gcr.io/google/ubuntu1804
+        - BASE_OS_TAG=latest
+>>>>>>> 6c55b73523a ([Docker] Fix base container alias (#4141))
       context: ./docker/linux
       dockerfile: base/Dockerfile
     image: base-xenial

docker/linux/base/Dockerfile

@@ -14,7 +14,13 @@
 
 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}
+
+COPY base/clean-after-apt.sh /opt/clean-after-apt.sh
+>>>>>>> 6c55b73523a ([Docker] Fix base container alias (#4141))
 
 ENV PYTHONUNBUFFERED 1