File tree Expand file tree Collapse file tree 4 files changed +45
-3
lines changed Expand file tree Collapse file tree 4 files changed +45
-3
lines changed Original file line number Diff line number Diff line change
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
Original file line number Diff line number Diff line change @@ -25,7 +25,7 @@ ARCH?=amd64
25
25
ALL_ARCH = amd64 arm arm64 ppc64le s390x
26
26
27
27
TEMP_DIR: =$(shell mktemp -d)
28
- QEMUVERSION =v2.9.1
28
+ QEMUVERSION =v4.2.0-6
29
29
30
30
SUDO =$(if $(filter 0,$(shell id -u) ) ,,sudo)
31
31
Original file line number Diff line number Diff line change @@ -21,7 +21,8 @@ ARCH?=amd64
21
21
ALL_ARCH = amd64 arm arm64 ppc64le s390x
22
22
TEMP_DIR: =$(shell mktemp -d)
23
23
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
25
26
26
27
# This option is for running docker manifest command
27
28
export DOCKER_CLI_EXPERIMENTAL := enabled
Original file line number Diff line number Diff line change @@ -86,7 +86,7 @@ bin/$(BIN)-$(ARCH): $(SRCS)
86
86
87
87
container : .container-$(ARCH )
88
88
.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 ) .
90
90
touch $@
91
91
92
92
push : .push-$(ARCH )
You can’t perform that action at this time.
0 commit comments