Merge pull request #90558 from dims/add-cloudbuild-yaml-for-debian-base-iptables-and-pause

Add cloudbuild.yaml for debian-base/debian-iptables and pause
This commit is contained in:
Kubernetes Prow Robot 2020-04-30 15:56:04 -07:00 committed by GitHub
commit 1ebb55e6e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 45 additions and 3 deletions

41
build/cloudbuild.yaml Normal file
View File

@ -0,0 +1,41 @@
# 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:v20200422-b25d964'
entrypoint: make
dir: ./build/debian-base
env:
- DOCKER_CLI_EXPERIMENTAL=enabled
- REGISTRY=gcr.io/$PROJECT_ID
- IMAGE=gcr.io/$PROJECT_ID/debian-base
- BUILD_IMAGE=debian-build
- HOME=/root
args:
- all-push
- name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20200422-b25d964'
entrypoint: make
dir: ./build/debian-iptables
env:
- DOCKER_CLI_EXPERIMENTAL=enabled
- REGISTRY=gcr.io/$PROJECT_ID
- BASE_REGISTRY=gcr.io/$PROJECT_ID
- IMAGE=gcr.io/$PROJECT_ID/debian-iptables
- HOME=/root
args:
- all-push
- name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20200422-b25d964'
entrypoint: 'bash'
dir: ./build/pause
env:
- DOCKER_CLI_EXPERIMENTAL=enabled
- REGISTRY=gcr.io/$PROJECT_ID
- IMAGE=gcr.io/$PROJECT_ID/pause
- HOME=/root
args:
- '-c'
- |
gcloud auth configure-docker \
&& make all-push

View File

@ -25,7 +25,7 @@ ARCH?=amd64
ALL_ARCH = amd64 arm arm64 ppc64le s390x ALL_ARCH = amd64 arm arm64 ppc64le s390x
TEMP_DIR:=$(shell mktemp -d) TEMP_DIR:=$(shell mktemp -d)
QEMUVERSION=v2.9.1 QEMUVERSION=v4.2.0-6
SUDO=$(if $(filter 0,$(shell id -u)),,sudo) SUDO=$(if $(filter 0,$(shell id -u)),,sudo)

View File

@ -21,7 +21,8 @@ ARCH?=amd64
ALL_ARCH = amd64 arm arm64 ppc64le s390x ALL_ARCH = amd64 arm arm64 ppc64le s390x
TEMP_DIR:=$(shell mktemp -d) TEMP_DIR:=$(shell mktemp -d)
BASEIMAGE?=k8s.gcr.io/debian-base-$(ARCH):v2.0.1 BASE_REGISTRY?=k8s.gcr.io
BASEIMAGE?=$(BASE_REGISTRY)/debian-base-$(ARCH):v2.0.1
# This option is for running docker manifest command # This option is for running docker manifest command
export DOCKER_CLI_EXPERIMENTAL := enabled export DOCKER_CLI_EXPERIMENTAL := enabled

View File

@ -86,7 +86,7 @@ bin/$(BIN)-$(ARCH): $(SRCS)
container: .container-$(ARCH) container: .container-$(ARCH)
.container-$(ARCH): bin/$(BIN)-$(ARCH) .container-$(ARCH): bin/$(BIN)-$(ARCH)
DOCKER_CLI_EXPERIMENTAL=enabled docker buildx build --pull --platform linux/$(ARCH) -t $(IMAGE_WITH_ARCH):$(TAG) --build-arg ARCH=$(ARCH) . DOCKER_CLI_EXPERIMENTAL=enabled docker buildx build --load --pull --platform linux/$(ARCH) -t $(IMAGE_WITH_ARCH):$(TAG) --build-arg ARCH=$(ARCH) .
touch $@ touch $@
push: .push-$(ARCH) push: .push-$(ARCH)