diff --git a/images/nginx/Makefile b/images/nginx/Makefile index df34fd945..f4b319e7e 100644 --- a/images/nginx/Makefile +++ b/images/nginx/Makefile @@ -18,24 +18,18 @@ SHELL=/bin/bash -o pipefail # 0.0.0 shouldn't clobber any released builds -TAG ?= 0.102 +TAG ?= 0.103 REGISTRY ?= quay.io/kubernetes-ingress-controller IMAGE = $(REGISTRY)/nginx -PLATFORMS = amd64 arm arm64 s390x - -EMPTY := -SPACE := $(EMPTY) $(EMPTY) -COMMA := , - -.PHONY: container -container: - DOCKER_CLI_EXPERIMENTAL=enabled docker buildx build \ +.PHONY: image +image: + docker buildx build \ --pull \ --push \ --progress plain \ - --platform $(subst $(SPACE),$(COMMA),$(PLATFORMS)) \ + --platform amd64,arm,arm64,s390x \ --tag $(IMAGE):$(TAG) rootfs .PHONY: init-docker-buildx diff --git a/images/nginx/rootfs/Dockerfile b/images/nginx/rootfs/Dockerfile index 07c837d47..67d639ee2 100644 --- a/images/nginx/rootfs/Dockerfile +++ b/images/nginx/rootfs/Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. -FROM alpine:3.11 as builder +FROM alpine:3.12 as builder COPY . / @@ -21,7 +21,7 @@ RUN apk add -U bash \ && /build.sh # Use a multi-stage build -FROM alpine:3.11 +FROM alpine:3.12 ENV PATH=$PATH:/usr/local/luajit/bin:/usr/local/nginx/sbin:/usr/local/nginx/bin