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

Cloud Build: No more need for Docker 20 tag #2691

Merged
merged 3 commits into from
Aug 5, 2022
Merged

Cloud Build: No more need for Docker 20 tag #2691

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
37ed335
Cloud Build: No more need for Docker 20 tag
markmandel Jul 29, 2022
a0d9f15
Merge branch 'main' into build/no-docker-20-tag
roberthbailey Aug 1, 2022
d54b779
Merge branch 'main' into build/no-docker-20-tag
roberthbailey Aug 4, 2022
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
8 changes: 4 additions & 4 deletions cloudbuild.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ steps:
# Print Docker version
#

- name: "gcr.io/cloud-builders/docker:20.10.13"
- name: gcr.io/cloud-builders/docker
id: docker-version
args: ["--version"]

Expand Down Expand Up @@ -63,9 +63,9 @@ steps:
#

- name: "ubuntu"
args: ["bash", "-c", "echo 'FROM gcr.io/cloud-builders/docker:20.10.13\nRUN apt-get install make\nENTRYPOINT [\"/usr/bin/make\"]' > Dockerfile.build"]
args: ["bash", "-c", "echo 'FROM gcr.io/cloud-builders/docker\nRUN apt-get install make\nENTRYPOINT [\"/usr/bin/make\"]' > Dockerfile.build"]
waitFor: ['-']
- name: "gcr.io/cloud-builders/docker:20.10.13"
- name: gcr.io/cloud-builders/docker
id: build-make-docker
args: ['build', '-f', 'Dockerfile.build', '-t', 'make-docker', '.'] # we need docker and make to run everything.

Expand Down Expand Up @@ -106,7 +106,7 @@ steps:
# build the e2e test runner
#

- name: 'gcr.io/cloud-builders/docker'
- name: gcr.io/cloud-builders/docker
args: ['build', '-f', 'Dockerfile', '-t', 'e2e-runner', '.']
dir: 'build/e2e-image'
id: build-e2e
Expand Down