Update nginx image to use alpine 3.12
This commit is contained in:
parent
734f3853a4
commit
efbd0e54e8
2 changed files with 7 additions and 13 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in a new issue