From 1fcf4444c815214770b102bef3e95912136fd2fe Mon Sep 17 00:00:00 2001 From: Manuel Alejandro de Brito Fontes Date: Fri, 26 Jun 2020 20:10:34 -0400 Subject: [PATCH] Trigger build with buildx --- images/cfssl/Makefile | 4 ++-- images/fastcgi-helloserver/Makefile | 4 ++-- images/httpbin/Makefile | 4 ++-- images/test-runner/Makefile | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/images/cfssl/Makefile b/images/cfssl/Makefile index 4d85ae5c4..344646462 100644 --- a/images/cfssl/Makefile +++ b/images/cfssl/Makefile @@ -27,11 +27,11 @@ IMAGE = $(REGISTRY)/e2e-test-cfssl export DOCKER_CLI_EXPERIMENTAL=enabled # build with buildx -PLATFORMS?=linux/amd64 +PLATFORMS?=linux/amd64,linux/arm,linux/arm64,linux/s390x OUTPUT= PROGRESS=plain -build: +build: ensure-buildx docker buildx build \ --platform=${PLATFORMS} $(OUTPUT) \ --progress=$(PROGRESS) \ diff --git a/images/fastcgi-helloserver/Makefile b/images/fastcgi-helloserver/Makefile index 622a89cc4..e35e1fa79 100644 --- a/images/fastcgi-helloserver/Makefile +++ b/images/fastcgi-helloserver/Makefile @@ -29,11 +29,11 @@ IMAGE = $(REGISTRY)/e2e-test-fastcgi-helloserver export DOCKER_CLI_EXPERIMENTAL=enabled # build with buildx -PLATFORMS?=linux/amd64 +PLATFORMS?=linux/amd64,linux/arm,linux/arm64 OUTPUT= PROGRESS=plain -build: +build: ensure-buildx docker buildx build \ --platform=${PLATFORMS} $(OUTPUT) \ --progress=$(PROGRESS) \ diff --git a/images/httpbin/Makefile b/images/httpbin/Makefile index 02a862bee..d0c7d40c2 100644 --- a/images/httpbin/Makefile +++ b/images/httpbin/Makefile @@ -27,11 +27,11 @@ IMAGE = $(REGISTRY)/e2e-test-httpbin export DOCKER_CLI_EXPERIMENTAL=enabled # build with buildx -PLATFORMS?=linux/amd64 +PLATFORMS?=linux/amd64,linux/arm,linux/arm64,linux/s390x OUTPUT= PROGRESS=plain -build: +build: ensure-buildx docker buildx build \ --platform=${PLATFORMS} $(OUTPUT) \ --progress=$(PROGRESS) \ diff --git a/images/test-runner/Makefile b/images/test-runner/Makefile index f8d757135..7da8dcb8f 100644 --- a/images/test-runner/Makefile +++ b/images/test-runner/Makefile @@ -31,7 +31,7 @@ PLATFORMS?=linux/amd64 OUTPUT= PROGRESS=plain -build: +build: ensure-buildx docker buildx build \ --platform=${PLATFORMS} $(OUTPUT) \ --progress=$(PROGRESS) \ @@ -47,7 +47,7 @@ build: --build-arg CHART_TESTING_VERSION=3.0.0-beta.1 \ --build-arg YAML_LINT_VERSION=1.13.0 \ --build-arg YAMALE_VERSION=1.8.0 \ - --build-arg HELM_VERSION=v3.2.0 \ + --build-arg HELM_VERSION=v3.2.1 \ -t $(IMAGE):$(TAG) rootfs # push the cross built image