Skip to content

Commit

Permalink
images: Update gcb-docker-cloud image to v20210722-085d930
Browse files Browse the repository at this point in the history
Signed-off-by: Stephen Augustus <[email protected]>
  • Loading branch information
justaugustus committed Aug 31, 2021
1 parent 96c97b2 commit 5ab30f4
Show file tree
Hide file tree
Showing 8 changed files with 37 additions and 7 deletions.
4 changes: 3 additions & 1 deletion cmd/vulndash/cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,15 @@

# this must be specified in seconds. If omitted, defaults to 600s (10 mins)
timeout: 1200s

# this prevents errors if you don't use both _GIT_TAG and _PULL_BASE_REF,
# or any new substitutions added in the future.
options:
substitution_option: ALLOW_LOOSE
machineType: 'N1_HIGHCPU_8'

steps:
- name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20201130-750d12f'
- name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20210722-085d930'
entrypoint: 'bash'
dir: ./cmd/vulndash
env:
Expand Down
19 changes: 19 additions & 0 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -441,3 +441,22 @@ dependencies:
refPaths:
- path: images/build/setcap/variants.yaml
match: '[a-zA-Z]+\-v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)'

# Build environments
- name: "gcr.io/k8s-testimages/gcb-docker-gcloud"
version: v20210722-085d930
refPaths:
- path: cmd/vulndash/cloudbuild.yaml
match: "name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v[0-9]{8}-[a-z0-9]{7}'"
- path: images/build/cross/cloudbuild.yaml
match: "name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v[0-9]{8}-[a-z0-9]{7}'"
- path: images/build/debian-base/cloudbuild.yaml
match: "name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v[0-9]{8}-[a-z0-9]{7}'"
- path: images/build/debian-iptables/cloudbuild.yaml
match: "name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v[0-9]{8}-[a-z0-9]{7}'"
- path: images/build/go-runner/cloudbuild.yaml
match: "name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v[0-9]{8}-[a-z0-9]{7}'"
- path: images/build/setcap/cloudbuild.yaml
match: "name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v[0-9]{8}-[a-z0-9]{7}'"
- path: images/releng/k8s-ci-builder/cloudbuild.yaml
match: "name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v[0-9]{8}-[a-z0-9]{7}'"
2 changes: 1 addition & 1 deletion images/build/cross/cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ options:
substitution_option: ALLOW_LOOSE

steps:
- name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20201130-750d12f'
- name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20210722-085d930'
entrypoint: 'bash'
dir: ./images/build/cross
env:
Expand Down
4 changes: 3 additions & 1 deletion images/build/debian-base/cloudbuild.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
# See https://cloud.google.com/cloud-build/docs/build-config
timeout: 1200s

options:
substitution_option: ALLOW_LOOSE
machineType: 'N1_HIGHCPU_8'

steps:
- name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20201130-750d12f'
- name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20210722-085d930'
entrypoint: bash
dir: ./images/build/debian-base
env:
Expand Down
4 changes: 3 additions & 1 deletion images/build/debian-iptables/cloudbuild.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
# See https://cloud.google.com/cloud-build/docs/build-config
timeout: 1200s

options:
substitution_option: ALLOW_LOOSE
machineType: 'N1_HIGHCPU_8'

steps:
- name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20201130-750d12f'
- name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20210722-085d930'
entrypoint: bash
dir: ./images/build/debian-iptables
env:
Expand Down
4 changes: 3 additions & 1 deletion images/build/go-runner/cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

# this must be specified in seconds. If omitted, defaults to 600s (10 mins)
timeout: 1200s

# this prevents errors if you don't use both _GIT_TAG and _PULL_BASE_REF,
# or any new substitutions added in the future.
options:
Expand All @@ -16,7 +17,8 @@ steps:
- '-key'
- 'distroless-cosign.pub' # From https://github.com/GoogleContainerTools/distroless/blob/main/cosign.pub
- 'gcr.io/distroless/$_DISTROLESS_IMAGE'
- name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20201130-750d12f'

- name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20210722-085d930'
entrypoint: 'bash'
dir: ./images/build/go-runner
env:
Expand Down
5 changes: 4 additions & 1 deletion images/build/setcap/cloudbuild.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
# See https://cloud.google.com/cloud-build/docs/build-config
timeout: 1200s

options:
substitution_option: ALLOW_LOOSE
machineType: 'N1_HIGHCPU_8'

steps:
- name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20201130-750d12f'
- name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20210722-085d930'
entrypoint: bash
dir: ./images/build/setcap
env:
Expand All @@ -22,6 +24,7 @@ steps:
- |
gcloud auth configure-docker && \
make all-push
substitutions:
# _GIT_TAG will be filled with a git-based tag for the image, of the form vYYYYMMDD-hash, and
# can be used as a substitution
Expand Down
2 changes: 1 addition & 1 deletion images/releng/k8s-ci-builder/cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ options:

steps:
# TODO: Update image version
- name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20201130-750d12f'
- name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20210722-085d930'
entrypoint: 'bash'
dir: ./images/releng/k8s-ci-builder
env:
Expand Down

0 comments on commit 5ab30f4

Please sign in to comment.