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

Merge pull request #4747 from FRI-DAY/image-add-opencontainer-source-label

Browse source 
Docker image: Add source code reference label
This commit is contained in:
Kubernetes Prow Robot 2019-11-18 19:23:41 -08:00 committed by GitHub
commit 3ffe85537f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Makefile
View file

@ -117,6 +117,7 @@ container: clean-container .container-$(ARCH)
cp -RP ./* $(TEMP_DIR) cp -RP ./* $(TEMP_DIR)
$(SED_I) "s|BASEIMAGE|$(BASEIMAGE)|g" $(DOCKERFILE) $(SED_I) "s|BASEIMAGE|$(BASEIMAGE)|g" $(DOCKERFILE)
$(SED_I) "s|QEMUARCH|$(QEMUARCH)|g" $(DOCKERFILE) $(SED_I) "s|QEMUARCH|$(QEMUARCH)|g" $(DOCKERFILE)
$(SED_I) "s|VERSION|$(TAG)|g" $(DOCKERFILE)
ifeq ($(ARCH),amd64) ifeq ($(ARCH),amd64)
# When building "normally" for amd64, remove the whole line, it has no part in the amd64 image # When building "normally" for amd64, remove the whole line, it has no part in the amd64 image

7
rootfs/Dockerfile
View file

@ -14,6 +14,13 @@
FROM BASEIMAGE FROM BASEIMAGE
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.source="https://github.com/kubernetes/ingress-nginx"
LABEL org.opencontainers.image.vendor='The Kubernetes Authors'
LABEL org.opencontainers.image.licenses='Apache-2.0'
LABEL org.opencontainers.image.version='VERSION'
CROSS_BUILD_COPY qemu-QEMUARCH-static /usr/bin/ CROSS_BUILD_COPY qemu-QEMUARCH-static /usr/bin/
WORKDIR /etc/nginx WORKDIR /etc/nginx