Skip to content

Commit 2431de4

Browse files
committed
build: Split out building for debian-{base,iptables} and pause images
- Eliminates a failure in one image build from prevent the others - Allows subdir approvers ownership over individual builds - Makes cleanup a little easier if one or more of these images go away Signed-off-by: Stephen Augustus <[email protected]>
1 parent 42bb148 commit 2431de4

File tree

4 files changed

+49
-39
lines changed

4 files changed

+49
-39
lines changed

build/cloudbuild.yaml

Lines changed: 0 additions & 39 deletions
This file was deleted.

build/debian-base/cloudbuild.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# See https://cloud.google.com/cloud-build/docs/build-config
2+
timeout: 1200s
3+
options:
4+
substitution_option: ALLOW_LOOSE
5+
machineType: 'N1_HIGHCPU_8'
6+
steps:
7+
- name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20200422-b25d964'
8+
entrypoint: make
9+
env:
10+
- DOCKER_CLI_EXPERIMENTAL=enabled
11+
- REGISTRY=gcr.io/$PROJECT_ID
12+
- IMAGE=gcr.io/$PROJECT_ID/debian-base
13+
- BUILD_IMAGE=debian-build
14+
args:
15+
- all-push
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# See https://cloud.google.com/cloud-build/docs/build-config
2+
timeout: 1200s
3+
options:
4+
substitution_option: ALLOW_LOOSE
5+
machineType: 'N1_HIGHCPU_8'
6+
steps:
7+
- name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20200422-b25d964'
8+
entrypoint: make
9+
env:
10+
- DOCKER_CLI_EXPERIMENTAL=enabled
11+
- REGISTRY=gcr.io/$PROJECT_ID
12+
- BASE_REGISTRY=gcr.io/$PROJECT_ID
13+
- IMAGE=gcr.io/$PROJECT_ID/debian-iptables
14+
args:
15+
- all-push

build/pause/cloudbuild.yaml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# See https://cloud.google.com/cloud-build/docs/build-config
2+
timeout: 1200s
3+
options:
4+
substitution_option: ALLOW_LOOSE
5+
machineType: 'N1_HIGHCPU_8'
6+
steps:
7+
- name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20200422-b25d964'
8+
entrypoint: 'bash'
9+
dir: ./build/pause
10+
env:
11+
- DOCKER_CLI_EXPERIMENTAL=enabled
12+
- REGISTRY=gcr.io/$PROJECT_ID
13+
- IMAGE=gcr.io/$PROJECT_ID/pause
14+
- HOME=/root
15+
args:
16+
- '-c'
17+
- |
18+
gcloud auth configure-docker \
19+
&& make all-push

0 commit comments

Comments
 (0)