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

Update nginx image to use alpine 3.12

Browse source
This commit is contained in:
Manuel Alejandro de Brito Fontes 2020-05-30 16:00:20 -04:00
parent 734f3853a4
commit efbd0e54e8
2 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
images/nginx/Makefile
View file

@ -18,24 +18,18 @@
SHELL=/bin/bash -o pipefail SHELL=/bin/bash -o pipefail
# 0.0.0 shouldn't clobber any released builds # 0.0.0 shouldn't clobber any released builds
TAG ?= 0.102 TAG ?= 0.103
REGISTRY ?= quay.io/kubernetes-ingress-controller REGISTRY ?= quay.io/kubernetes-ingress-controller
IMAGE = $(REGISTRY)/nginx IMAGE = $(REGISTRY)/nginx
PLATFORMS = amd64 arm arm64 s390x .PHONY: image
image:
EMPTY := docker buildx build \
SPACE := $(EMPTY) $(EMPTY)
COMMA := ,
.PHONY: container
container:
DOCKER_CLI_EXPERIMENTAL=enabled docker buildx build \
--pull \ --pull \
--push \ --push \
--progress plain \ --progress plain \
--platform $(subst $(SPACE),$(COMMA),$(PLATFORMS)) \ --platform amd64,arm,arm64,s390x \
--tag $(IMAGE):$(TAG) rootfs --tag $(IMAGE):$(TAG) rootfs
.PHONY: init-docker-buildx .PHONY: init-docker-buildx

4
images/nginx/rootfs/Dockerfile
View file

@ -13,7 +13,7 @@
# limitations under the License. # limitations under the License.
FROM alpine:3.11 as builder FROM alpine:3.12 as builder
COPY . / COPY . /
@ -21,7 +21,7 @@ RUN apk add -U bash \
&& /build.sh && /build.sh
# Use a multi-stage build # 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 ENV PATH=$PATH:/usr/local/luajit/bin:/usr/local/nginx/sbin:/usr/local/nginx/bin