From 31687185638c8096a7cc4287850bf340a60883e2 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Mon, 5 Sep 2022 15:57:29 +0200 Subject: [PATCH 1/4] Update git commit command Signed-off-by: Evan Lezar --- Makefile | 3 ++- versions.mk | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e792beb3..a9fc1ffe 100644 --- a/Makefile +++ b/Makefile @@ -51,6 +51,7 @@ CLI_VERSION = $(LIB_VERSION)$(if $(LIB_TAG),-$(LIB_TAG)) else CLI_VERSION = $(VERSION) endif +CLI_VERSION_PACKAGE = github.com/NVIDIA/nvidia-container-toolkit/internal/info GOOS ?= linux @@ -60,7 +61,7 @@ cmd-%: COMMAND_BUILD_OPTIONS = -o $(PREFIX)/$(*) endif cmds: $(CMD_TARGETS) $(CMD_TARGETS): cmd-%: - GOOS=$(GOOS) go build -ldflags "-s -w -X github.com/NVIDIA/nvidia-container-toolkit/internal/info.gitCommit=$(GIT_COMMIT) -X github.com/NVIDIA/nvidia-container-toolkit/internal/info.version=$(CLI_VERSION)" $(COMMAND_BUILD_OPTIONS) $(MODULE)/cmd/$(*) + GOOS=$(GOOS) go build -ldflags "-s -w -X $(CLI_VERSION_PACKAGE).gitCommit=$(GIT_COMMIT) -X $(CLI_VERSION_PACKAGE).version=$(CLI_VERSION)" $(COMMAND_BUILD_OPTIONS) $(MODULE)/cmd/$(*) build: GOOS=$(GOOS) go build ./... diff --git a/versions.mk b/versions.mk index b993813b..ca5753b5 100644 --- a/versions.mk +++ b/versions.mk @@ -27,4 +27,4 @@ LIBNVIDIA_CONTAINER0_VERSION := 0.10.0+jetpack CUDA_VERSION := 11.7.1 GOLANG_VERSION := 1.17.8 -GIT_COMMIT ?= $(shell git describe --dirty --long --always 2> /dev/null || echo "") +GIT_COMMIT ?= $(shell git describe --match="" --dirty --long --always 2> /dev/null || echo "") From cb0c94cd40dcd6d9467ee3a74054cdf904fcfb94 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Mon, 5 Sep 2022 15:57:57 +0200 Subject: [PATCH 2/4] Bump version to v1.11.0 Signed-off-by: Evan Lezar --- CHANGELOG.md | 4 ++++ versions.mk | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 56f5d801..9ccc3866 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # NVIDIA Container Toolkit Changelog +## v1.11.0 + +* Promote v1.11.0-rc.3 to v1.11.0 + ## v1.11.0-rc.3 * Build fedora35 packages diff --git a/versions.mk b/versions.mk index ca5753b5..55bd9040 100644 --- a/versions.mk +++ b/versions.mk @@ -14,7 +14,7 @@ LIB_NAME := nvidia-container-toolkit LIB_VERSION := 1.11.0 -LIB_TAG := rc.3 +LIB_TAG := # Specify the nvidia-docker2 and nvidia-container-runtime package versions. # Note: The tag is automatically specified to match LIB_TAG. From 691b93ffb09466ea08880ba7ce0205868e7a5b6c Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Mon, 5 Sep 2022 16:33:42 +0200 Subject: [PATCH 3/4] Update libnvidia-container submodule Signed-off-by: Evan Lezar --- third_party/libnvidia-container | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/libnvidia-container b/third_party/libnvidia-container index 2ef66649..c8f267be 160000 --- a/third_party/libnvidia-container +++ b/third_party/libnvidia-container @@ -1 +1 @@ -Subproject commit 2ef666498c95f759290016cc7cbcf76ce9abcaac +Subproject commit c8f267be0bac1c654d59ad4ea5df907141149977 From 2dbcda26191335e6e38ff85d6127c2dd3f5d8ce5 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Mon, 5 Sep 2022 17:04:49 +0200 Subject: [PATCH 4/4] Ensure that base package is built for debian Signed-off-by: Evan Lezar --- docker/Dockerfile.debian | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile.debian b/docker/Dockerfile.debian index 0394ab84..602e3266 100644 --- a/docker/Dockerfile.debian +++ b/docker/Dockerfile.debian @@ -78,4 +78,4 @@ RUN dch --create --package="${PKG_NAME}" \ CMD export DISTRIB="$(lsb_release -cs)" && \ debuild -eDISTRIB -eSECTION -eLIBNVIDIA_CONTAINER_TOOLS_VERSION -eVERSION="${REVISION}" \ --dpkg-buildpackage-hook='sh debian/prepare' -i -us -uc -b && \ - mv /tmp/nvidia-container-toolkit_*.deb /dist + mv /tmp/*.deb /dist