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.

Sign up for GitHub

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

Jump to bottom

[Docker] Fix base container alias #4141

Merged
merged 3 commits into from
Sep 23, 2024
Merged

[Docker] Fix base container alias #4141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2bd462d
[Docker] Fix base container alias
kaidokert Sep 23, 2024
ca83e71
Try gcloud auth config-docker
kaidokert Sep 23, 2024
be642ce
Fix ubuntu18 images
kaidokert Sep 23, 2024
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
1 change: 1 addition & 0 deletions .github/actions/docker/action.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,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
Expand Down
2 changes: 1 addition & 1 deletion cobalt/site/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:latest}

RUN apt update -qqy \
&& apt install -qqy --no-install-recommends \
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,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
Expand Down
2 changes: 1 addition & 1 deletion docker/linux/base/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

ARG BASE_OS
ARG BASE_OS_TAG
FROM ${BASE_OS:-gcr.io/cloud-marketplace-containers/google/debian11}:${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

Expand Down
Loading