diff --git a/Makefile b/Makefile index f8566e5ae4..b23c43e346 100644 --- a/Makefile +++ b/Makefile @@ -39,6 +39,7 @@ E2E_CHECK_LEAKS ?= REPO_INFO ?= $(shell git config --get remote.origin.url) COMMIT_SHA ?= git-$(shell git rev-parse --short HEAD) +BUILD_ID ?= "UNSET" PKG = k8s.io/ingress-nginx @@ -66,6 +67,7 @@ image: clean-image ## Build image for a particular arch. --build-arg VERSION="$(TAG)" \ --build-arg TARGETARCH="$(ARCH)" \ --build-arg COMMIT_SHA="$(COMMIT_SHA)" \ + --build-arg BUILD_ID="$(BUILD_ID)" \ -t $(REGISTRY)/controller:$(TAG) rootfs .PHONY: clean-image @@ -215,4 +217,5 @@ release: ensure-buildx clean --build-arg BASE_IMAGE="$(BASE_IMAGE)" \ --build-arg VERSION="$(TAG)" \ --build-arg COMMIT_SHA="$(COMMIT_SHA)" \ + --build-arg BUILD_ID="$(BUILD_ID)" \ -t $(REGISTRY)/controller:$(TAG) rootfs diff --git a/rootfs/Dockerfile b/rootfs/Dockerfile index 2d523d6180..49abbdac2b 100644 --- a/rootfs/Dockerfile +++ b/rootfs/Dockerfile @@ -19,6 +19,7 @@ FROM ${BASE_IMAGE} ARG TARGETARCH ARG VERSION ARG COMMIT_SHA +ARG BUILD_ID=UNSET LABEL org.opencontainers.image.title="NGINX Ingress Controller for Kubernetes" LABEL org.opencontainers.image.documentation="https://kubernetes.github.io/ingress-nginx/" @@ -28,6 +29,8 @@ LABEL org.opencontainers.image.licenses="Apache-2.0" LABEL org.opencontainers.image.version="${VERSION}" LABEL org.opencontainers.image.revision="${COMMIT_SHA}" +LABEL build_id="${BUILD_ID}" + WORKDIR /etc/nginx RUN apk update \