Merge pull request #255 from NVIDIA/add-commit-label-to-image

USE GIT_COMMIT in container builds

Author: rajathagasthya

Makefile

@@ -162,6 +162,7 @@ $(DRIVER_BUILD_TARGETS):
 				--build-arg DRIVER_BRANCH="$(DRIVER_BRANCH)" \
 				--build-arg CUDA_VERSION="$(CUDA_VERSION)" \
 				--build-arg CVE_UPDATES="$(CVE_UPDATES)" \
+				--build-arg GIT_COMMIT="$(GIT_COMMIT)" \
 				$(DOCKER_BUILD_ARGS) \
 				--file $(DOCKERFILE) \
 				$(CURDIR)/$(SUBDIR)

rhel10/Dockerfile

@@ -43,6 +43,7 @@ ARG DRIVER_VERSION
 ENV DRIVER_VERSION=$DRIVER_VERSION
 ARG DRIVER_BRANCH
 ENV DRIVER_BRANCH=$DRIVER_BRANCH
+ARG GIT_COMMIT
 
 # Arg to indicate if driver type is either of passthrough/baremetal or vgpu
 ARG DRIVER_TYPE=passthrough
@@ -99,6 +100,7 @@ LABEL io.k8s.display-name="NVIDIA Driver Container"
 LABEL name="NVIDIA Driver Container"
 LABEL vendor="NVIDIA"
 LABEL version="${DRIVER_VERSION}"
+LABEL vcs-ref="${GIT_COMMIT}"
 LABEL release="N/A"
 LABEL summary="Provision the NVIDIA driver through containers"
 LABEL description="See summary"

rhel10/precompiled/Dockerfile

@@ -93,6 +93,8 @@ ARG BUILD_ARCH
 ARG TARGET_ARCH
 ENV TARGETARCH=${TARGET_ARCH}
 
+ARG GIT_COMMIT
+
 # Force using provided RHSM registration
 ENV SMDEV_CONTAINER_OFF=1
 
@@ -179,6 +181,7 @@ LABEL io.k8s.display-name="NVIDIA Driver Container"
 LABEL name="NVIDIA Driver Container"
 LABEL vendor="NVIDIA"
 LABEL version="${DRIVER_VERSION}"
+LABEL vcs-ref="${GIT_COMMIT}"
 LABEL release="${KERNEL_VERSION}-${OS_TAG}"
 LABEL summary="Provision the NVIDIA driver through containers"
 LABEL description="See summary"

rhel10/precompiled/Makefile

@@ -1,3 +1,5 @@
+GIT_COMMIT ?= $(shell git describe --match="" --dirty --long --always --abbrev=40 2> /dev/null || echo "")
+
 RHEL_VERSION ?= 10.0
 RHEL_VERSION_MAJOR = $(shell echo "${RHEL_VERSION}" | awk -F. '{print $$1}')
 
@@ -70,6 +72,7 @@ image: rhsm-register
 		--build-arg DRIVER_STREAM_TYPE=${DRIVER_STREAM_TYPE} \
 		--build-arg BASE_URL=${BASE_URL} \
 		--build-arg OS_TAG=${OS_TAG} \
+		--build-arg GIT_COMMIT=${GIT_COMMIT} \
 		--tag ${IMAGE_REGISTRY}/${IMAGE_NAME}:${DRIVER_VERSION}-${KERNEL_VERSION_TAG}-${OS_TAG} \
 		--progress=plain \
 		--file ${DOCKERFILE} .

rhel8/Dockerfile

@@ -42,6 +42,7 @@ ARG DRIVER_VERSION
 ENV DRIVER_VERSION=$DRIVER_VERSION
 ARG DRIVER_BRANCH
 ENV DRIVER_BRANCH=$DRIVER_BRANCH
+ARG GIT_COMMIT
 
 # Arg to indicate if driver type is either of passthrough/baremetal or vgpu
 ARG DRIVER_TYPE=passthrough
@@ -97,6 +98,7 @@ LABEL io.k8s.display-name="NVIDIA Driver Container"
 LABEL name="NVIDIA Driver Container"
 LABEL vendor="NVIDIA"
 LABEL version="${DRIVER_VERSION}"
+LABEL vcs-ref="${GIT_COMMIT}"
 LABEL release="N/A"
 LABEL summary="Provision the NVIDIA driver through containers"
 LABEL description="See summary"

rhel8/precompiled/Dockerfile

@@ -67,6 +67,8 @@ ENV DRIVER_VERSION=${DRIVER_VERSION}
 ARG TARGET_ARCH=''
 ENV TARGETARCH=${TARGET_ARCH}
 
+ARG GIT_COMMIT
+
 # Force using provided RHSM registration
 ENV SMDEV_CONTAINER_OFF=1
 
@@ -146,6 +148,7 @@ LABEL io.k8s.display-name="NVIDIA Driver Container"
 LABEL name="NVIDIA Driver Container"
 LABEL vendor="NVIDIA"
 LABEL version="${DRIVER_VERSION}"
+LABEL vcs-ref="${GIT_COMMIT}"
 LABEL release="N/A"
 LABEL summary="Provision the NVIDIA driver through containers"
 LABEL description="See summary"

rhel8/precompiled/Makefile

@@ -1,4 +1,5 @@
 DOCKERFILE = Dockerfile
+GIT_COMMIT ?= $(shell git describe --match="" --dirty --long --always --abbrev=40 2> /dev/null || echo "")
 RHEL_VERSION ?= 8.6
 CUDA_VERSION ?= 12.6.0
 CUDA_DIST ?= ubi8
@@ -52,6 +53,7 @@ image: rhsm-register
 		--build-arg DRIVER_TOOLKIT_IMAGE=${DRIVER_TOOLKIT_IMAGE} \
 		--build-arg DRIVER_TYPE=${DRIVER_TYPE} \
 		--build-arg BASE_URL=${BASE_URL} \
+		--build-arg GIT_COMMIT=${GIT_COMMIT} \
 		--tag ${IMAGE_REGISTRY}/${IMAGE_NAME}:${DRIVER_VERSION}-${KERNEL_VERSION}-${OS_TAG} \
 		--progress=plain \
 		--file ${DOCKERFILE} .

rhel9/Dockerfile

@@ -42,6 +42,7 @@ ARG DRIVER_VERSION
 ENV DRIVER_VERSION=$DRIVER_VERSION
 ARG DRIVER_BRANCH
 ENV DRIVER_BRANCH=$DRIVER_BRANCH
+ARG GIT_COMMIT
 
 # Arg to indicate if driver type is either of passthrough/baremetal or vgpu
 ARG DRIVER_TYPE=passthrough
@@ -98,6 +99,7 @@ LABEL io.k8s.display-name="NVIDIA Driver Container"
 LABEL name="NVIDIA Driver Container"
 LABEL vendor="NVIDIA"
 LABEL version="${DRIVER_VERSION}"
+LABEL vcs-ref="${GIT_COMMIT}"
 LABEL release="N/A"
 LABEL summary="Provision the NVIDIA driver through containers"
 LABEL description="See summary"

rhel9/precompiled/Dockerfile

@@ -93,6 +93,8 @@ ARG BUILD_ARCH
 ARG TARGET_ARCH
 ENV TARGETARCH=${TARGET_ARCH}
 
+ARG GIT_COMMIT
+
 # Force using provided RHSM registration
 ENV SMDEV_CONTAINER_OFF=1
 
@@ -179,6 +181,7 @@ LABEL io.k8s.display-name="NVIDIA Driver Container"
 LABEL name="NVIDIA Driver Container"
 LABEL vendor="NVIDIA"
 LABEL version="${DRIVER_VERSION}"
+LABEL vcs-ref="${GIT_COMMIT}"
 LABEL release="${KERNEL_VERSION}-${OS_TAG}"
 LABEL summary="Provision the NVIDIA driver through containers"
 LABEL description="See summary"

rhel9/precompiled/Makefile

@@ -1,3 +1,5 @@
+GIT_COMMIT ?= $(shell git describe --match="" --dirty --long --always --abbrev=40 2> /dev/null || echo "")
+
 RHEL_VERSION ?= 9.4
 RHEL_VERSION_MAJOR = $(shell echo "${RHEL_VERSION}" | awk -F. '{print $$1}')
 
@@ -70,6 +72,7 @@ image: rhsm-register
 		--build-arg DRIVER_STREAM_TYPE=${DRIVER_STREAM_TYPE} \
 		--build-arg BASE_URL=${BASE_URL} \
 		--build-arg OS_TAG=${OS_TAG} \
+		--build-arg GIT_COMMIT=${GIT_COMMIT} \
 		--tag ${IMAGE_REGISTRY}/${IMAGE_NAME}:${DRIVER_VERSION}-${KERNEL_VERSION_TAG}-${OS_TAG} \
 		--progress=plain \
 		--file ${DOCKERFILE} .