From fdfc97a7fb090afa3715811169bde75fa662a9e8 Mon Sep 17 00:00:00 2001
From: Marco Ebert <marco_ebert@icloud.com>
Date: Mon, 7 Oct 2024 14:30:21 +0200
Subject: [PATCH] Images: Drop `s390x`. (#12131)

---
 .github/workflows/images.yaml | 2 +-
 Makefile                      | 4 ++--
 hack/init-buildx.sh           | 5 ++---
 images/Makefile               | 2 +-
 images/nginx/Makefile         | 2 +-
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/images.yaml b/.github/workflows/images.yaml
index 77358e8b34..7804158ba7 100644
--- a/.github/workflows/images.yaml
+++ b/.github/workflows/images.yaml
@@ -169,7 +169,7 @@ jobs:
     if: |
       (github.event_name == 'push' && github.ref == 'refs/heads/main' && needs.changes.outputs.nginx == 'true')
     env:
-      PLATFORMS: linux/amd64,linux/arm,linux/arm64,linux/s390x
+      PLATFORMS: linux/amd64,linux/arm,linux/arm64
     steps:
       - name: Checkout
         uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
diff --git a/Makefile b/Makefile
index 033577e144..1c35c12b23 100644
--- a/Makefile
+++ b/Makefile
@@ -240,8 +240,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/hack/init-buildx.sh b/hack/init-buildx.sh
index 1a47bf145e..bac68e1ae1 100755
--- a/hack/init-buildx.sh
+++ b/hack/init-buildx.sh
@@ -42,12 +42,11 @@ fi
 # We can skip setup if the current builder already has multi-arch
 # AND if it isn't the docker driver, which doesn't work
 current_builder="$(docker buildx inspect)"
-# linux/amd64, linux/arm64, linux/riscv64, linux/ppc64le, linux/s390x, linux/386, linux/arm/v7, linux/arm/v6
+# linux/amd64, linux/arm, linux/arm64
 if ! grep -q "^Driver: docker$"  <<<"${current_builder}" && \
      grep -q "linux/amd64" <<<"${current_builder}" && \
      grep -q "linux/arm"   <<<"${current_builder}" && \
-     grep -q "linux/arm64" <<<"${current_builder}" && \
-     grep -q "linux/s390x" <<<"${current_builder}"; then
+     grep -q "linux/arm64" <<<"${current_builder}"; then
   exit 0
 fi
 
diff --git a/images/Makefile b/images/Makefile
index 990d772310..31560168d3 100644
--- a/images/Makefile
+++ b/images/Makefile
@@ -41,7 +41,7 @@ EXTRAARGS ?= $(shell cat $(NAME)/EXTRAARGS)
 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
 
diff --git a/images/nginx/Makefile b/images/nginx/Makefile
index 103ba217f9..3ed502759a 100644
--- a/images/nginx/Makefile
+++ b/images/nginx/Makefile
@@ -32,7 +32,7 @@ IMAGE = $(REGISTRY)/nginx
 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