Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Sep 23, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Cherry pick PR #4141: [Docker] Fix base container alias (#4142)
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]>
cobalt-github-releaser-bot and kaidokert committed Sep 23, 2024
commit 4a7de2e5abdfee7b522f8e608e3092b7976b980d
6 changes: 4 additions & 2 deletions .github/actions/docker/action.yaml
Original file line number Diff line number Diff line change
@@ -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:
@@ -66,7 +69,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
2 changes: 1 addition & 1 deletion cobalt/site/docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@
# limitations under the License.

ARG FROM_IMAGE
FROM ${FROM_IMAGE:-marketplace.gcr.io/google/debian11:latest}
FROM ${FROM_IMAGE:-marketplace.gcr.io/google/debian11}

RUN apt update -qqy \
&& apt install -qqy --no-install-recommends \