Skip to content

Commit 1ebb55e

Browse files
authored
Merge pull request kubernetes#90558 from dims/add-cloudbuild-yaml-for-debian-base-iptables-and-pause
Add cloudbuild.yaml for debian-base/debian-iptables and pause
2 parents 821c7b1 + a7b9ba7 commit 1ebb55e

File tree

4 files changed

+45
-3
lines changed

4 files changed

+45
-3
lines changed

build/cloudbuild.yaml

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
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+
dir: ./build/debian-base
10+
env:
11+
- DOCKER_CLI_EXPERIMENTAL=enabled
12+
- REGISTRY=gcr.io/$PROJECT_ID
13+
- IMAGE=gcr.io/$PROJECT_ID/debian-base
14+
- BUILD_IMAGE=debian-build
15+
- HOME=/root
16+
args:
17+
- all-push
18+
- name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20200422-b25d964'
19+
entrypoint: make
20+
dir: ./build/debian-iptables
21+
env:
22+
- DOCKER_CLI_EXPERIMENTAL=enabled
23+
- REGISTRY=gcr.io/$PROJECT_ID
24+
- BASE_REGISTRY=gcr.io/$PROJECT_ID
25+
- IMAGE=gcr.io/$PROJECT_ID/debian-iptables
26+
- HOME=/root
27+
args:
28+
- all-push
29+
- name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20200422-b25d964'
30+
entrypoint: 'bash'
31+
dir: ./build/pause
32+
env:
33+
- DOCKER_CLI_EXPERIMENTAL=enabled
34+
- REGISTRY=gcr.io/$PROJECT_ID
35+
- IMAGE=gcr.io/$PROJECT_ID/pause
36+
- HOME=/root
37+
args:
38+
- '-c'
39+
- |
40+
gcloud auth configure-docker \
41+
&& make all-push

build/debian-base/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ ARCH?=amd64
2525
ALL_ARCH = amd64 arm arm64 ppc64le s390x
2626

2727
TEMP_DIR:=$(shell mktemp -d)
28-
QEMUVERSION=v2.9.1
28+
QEMUVERSION=v4.2.0-6
2929

3030
SUDO=$(if $(filter 0,$(shell id -u)),,sudo)
3131

build/debian-iptables/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ ARCH?=amd64
2121
ALL_ARCH = amd64 arm arm64 ppc64le s390x
2222
TEMP_DIR:=$(shell mktemp -d)
2323

24-
BASEIMAGE?=k8s.gcr.io/debian-base-$(ARCH):v2.0.1
24+
BASE_REGISTRY?=k8s.gcr.io
25+
BASEIMAGE?=$(BASE_REGISTRY)/debian-base-$(ARCH):v2.0.1
2526

2627
# This option is for running docker manifest command
2728
export DOCKER_CLI_EXPERIMENTAL := enabled

build/pause/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ bin/$(BIN)-$(ARCH): $(SRCS)
8686

8787
container: .container-$(ARCH)
8888
.container-$(ARCH): bin/$(BIN)-$(ARCH)
89-
DOCKER_CLI_EXPERIMENTAL=enabled docker buildx build --pull --platform linux/$(ARCH) -t $(IMAGE_WITH_ARCH):$(TAG) --build-arg ARCH=$(ARCH) .
89+
DOCKER_CLI_EXPERIMENTAL=enabled docker buildx build --load --pull --platform linux/$(ARCH) -t $(IMAGE_WITH_ARCH):$(TAG) --build-arg ARCH=$(ARCH) .
9090
touch $@
9191

9292
push: .push-$(ARCH)

0 commit comments

Comments
 (0)