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

Cleanup docker build (#5084)

Browse source
This commit is contained in:
Manuel Alejandro de Brito Fontes 2020-02-15 13:59:56 -03:00 committed by GitHub
parent 6bd5cef01d
commit 12314aa1ac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
images/nginx/rootfs/Dockerfile
View file

@ -13,7 +13,7 @@
# limitations under the License. # limitations under the License.
FROM --platform=$BUILDPLATFORM alpine:3.11 as builder FROM alpine:3.11 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 --platform=$BUILDPLATFORM alpine:3.11 FROM alpine:3.11
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

2
rootfs/Dockerfile
View file

@ -15,7 +15,7 @@
ARG BASE_IMAGE ARG BASE_IMAGE
ARG VERSION ARG VERSION
FROM --platform=$BUILDPLATFORM ${BASE_IMAGE} FROM ${BASE_IMAGE}
LABEL org.opencontainers.image.title="NGINX Ingress Controller for Kubernetes" LABEL org.opencontainers.image.title="NGINX Ingress Controller for Kubernetes"
LABEL org.opencontainers.image.documentation="https://kubernetes.github.io/ingress-nginx/" LABEL org.opencontainers.image.documentation="https://kubernetes.github.io/ingress-nginx/"