DevFW-CICD/ingress-nginx-helm
12
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Images: Drop s390x. (#12131)

Browse source
This commit is contained in:
Marco Ebert 2024-10-07 14:30:21 +02:00 committed by GitHub
parent deb01b9f2c
commit fdfc97a7fb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/images.yaml vendored
View file

@ -169,7 +169,7 @@ jobs:
if: | if: |
(github.event_name == 'push' && github.ref == 'refs/heads/main' && needs.changes.outputs.nginx == 'true') (github.event_name == 'push' && github.ref == 'refs/heads/main' && needs.changes.outputs.nginx == 'true')
env: env:
PLATFORMS: linux/amd64,linux/arm,linux/arm64,linux/s390x PLATFORMS: linux/amd64,linux/arm,linux/arm64
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0

4
Makefile
View file

@ -240,8 +240,8 @@ ensure-buildx:
show-version: show-version:
echo -n $(TAG) echo -n $(TAG)
PLATFORMS ?= amd64 arm arm64 s390x PLATFORMS ?= amd64 arm arm64
BUILDX_PLATFORMS ?= linux/amd64,linux/arm,linux/arm64,linux/s390x BUILDX_PLATFORMS ?= linux/amd64,linux/arm,linux/arm64
.PHONY: release # Build a multi-arch docker image .PHONY: release # Build a multi-arch docker image
release: ensure-buildx clean release: ensure-buildx clean

5
hack/init-buildx.sh
View file

@ -42,12 +42,11 @@ fi
# We can skip setup if the current builder already has multi-arch # We can skip setup if the current builder already has multi-arch
# AND if it isn't the docker driver, which doesn't work # AND if it isn't the docker driver, which doesn't work
current_builder="$(docker buildx inspect)" 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}" && \ if ! grep -q "^Driver: docker$" <<<"${current_builder}" && \
grep -q "linux/amd64" <<<"${current_builder}" && \ grep -q "linux/amd64" <<<"${current_builder}" && \
grep -q "linux/arm" <<<"${current_builder}" && \ grep -q "linux/arm" <<<"${current_builder}" && \
grep -q "linux/arm64" <<<"${current_builder}" && \ grep -q "linux/arm64" <<<"${current_builder}"; then
grep -q "linux/s390x" <<<"${current_builder}"; then
exit 0 exit 0
fi fi

2
images/Makefile
View file

@ -41,7 +41,7 @@ EXTRAARGS ?= $(shell cat $(NAME)/EXTRAARGS)
export DOCKER_CLI_EXPERIMENTAL=enabled export DOCKER_CLI_EXPERIMENTAL=enabled
# build with buildx # build with buildx
PLATFORMS?=linux/amd64,linux/arm,linux/arm64,linux/s390x PLATFORMS?=linux/amd64,linux/arm,linux/arm64
OUTPUT= OUTPUT=
PROGRESS=plain PROGRESS=plain

2
images/nginx/Makefile
View file

@ -32,7 +32,7 @@ IMAGE = $(REGISTRY)/nginx
export DOCKER_CLI_EXPERIMENTAL=enabled export DOCKER_CLI_EXPERIMENTAL=enabled
# build with buildx # build with buildx
PLATFORMS?=linux/amd64,linux/arm,linux/arm64,linux/s390x PLATFORMS?=linux/amd64,linux/arm,linux/arm64
OUTPUT= OUTPUT=
PROGRESS=plain PROGRESS=plain
build: ensure-buildx build: ensure-buildx