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

Remove s390x from final image

Browse source
This commit is contained in:
Ricardo Katz 2024-01-27 10:39:12 -03:00
parent 5ee3ac02dd
commit 54432a1a38
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -231,8 +231,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

2
images/nginx-1.25/Makefile
View file

@ -32,7 +32,7 @@ IMAGE = $(REGISTRY)/nginx-1.25
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

2
images/nginx-1.25/cloudbuild.yaml
View file

@ -1,7 +1,7 @@
timeout: 10800s timeout: 10800s
options: options:
substitution_option: ALLOW_LOOSE 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 machineType: E2_HIGHCPU_32
steps: steps:
- name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20211118-2f2d816b90' - name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20211118-2f2d816b90'