From 54432a1a3805f06e64a21fc391744871f9bdde26 Mon Sep 17 00:00:00 2001 From: Ricardo Katz Date: Sat, 27 Jan 2024 10:39:12 -0300 Subject: [PATCH] Remove s390x from final image --- Makefile | 4 ++-- images/nginx-1.25/Makefile | 2 +- images/nginx-1.25/cloudbuild.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 964889532..5a2d81dd4 100644 --- a/Makefile +++ b/Makefile @@ -231,8 +231,8 @@ ensure-buildx: show-version: echo -n $(TAG) -PLATFORMS ?= amd64 arm arm64 s390x -BUILDX_PLATFORMS ?= linux/amd64,linux/arm,linux/arm64,linux/s390x +PLATFORMS ?= amd64 arm arm64 +BUILDX_PLATFORMS ?= linux/amd64,linux/arm,linux/arm64 .PHONY: release # Build a multi-arch docker image release: ensure-buildx clean diff --git a/images/nginx-1.25/Makefile b/images/nginx-1.25/Makefile index cdd3e2a3c..e03197109 100644 --- a/images/nginx-1.25/Makefile +++ b/images/nginx-1.25/Makefile @@ -32,7 +32,7 @@ IMAGE = $(REGISTRY)/nginx-1.25 export DOCKER_CLI_EXPERIMENTAL=enabled # build with buildx -PLATFORMS?=linux/amd64,linux/arm,linux/arm64,linux/s390x +PLATFORMS?=linux/amd64,linux/arm,linux/arm64 OUTPUT= PROGRESS=plain build: ensure-buildx diff --git a/images/nginx-1.25/cloudbuild.yaml b/images/nginx-1.25/cloudbuild.yaml index e3902c785..c94539165 100644 --- a/images/nginx-1.25/cloudbuild.yaml +++ b/images/nginx-1.25/cloudbuild.yaml @@ -1,7 +1,7 @@ timeout: 10800s options: substitution_option: ALLOW_LOOSE - # job builds a multi-arch docker image for amd64,arm,arm64 and s390x. + # job builds a multi-arch docker image for amd64,arm,arm64 machineType: E2_HIGHCPU_32 steps: - name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20211118-2f2d816b90'