UniqAI/nvidia-container-toolkit
1
0
Fork 0
mirror of https://github.com/NVIDIA/nvidia-container-toolkit synced 2024-11-26 05:49:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'bump-version-1.11.0' into 'main'

Browse Source 
Bump version to 1.11.0

See merge request nvidia/container-toolkit/container-toolkit!213
This commit is contained in:
Evan Lezar 2022-09-06 09:12:10 +00:00
commit d9de4a09b8
5 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -1,5 +1,9 @@
# NVIDIA Container Toolkit Changelog # NVIDIA Container Toolkit Changelog
## v1.11.0
* Promote v1.11.0-rc.3 to v1.11.0
## v1.11.0-rc.3 ## v1.11.0-rc.3
* Build fedora35 packages * Build fedora35 packages

3
Makefile
View File

@ -51,6 +51,7 @@ CLI_VERSION = $(LIB_VERSION)$(if $(LIB_TAG),-$(LIB_TAG))
else else
CLI_VERSION = $(VERSION) CLI_VERSION = $(VERSION)
endif endif
CLI_VERSION_PACKAGE = github.com/NVIDIA/nvidia-container-toolkit/internal/info
GOOS ?= linux GOOS ?= linux
@ -60,7 +61,7 @@ cmd-%: COMMAND_BUILD_OPTIONS = -o $(PREFIX)/$(*)
endif endif
cmds: $(CMD_TARGETS) cmds: $(CMD_TARGETS)
$(CMD_TARGETS): cmd-%: $(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: build:
GOOS=$(GOOS) go build ./... GOOS=$(GOOS) go build ./...

2
docker/Dockerfile.debian
View File

@ -78,4 +78,4 @@ RUN dch --create --package="${PKG_NAME}" \
CMD export DISTRIB="$(lsb_release -cs)" && \ CMD export DISTRIB="$(lsb_release -cs)" && \
debuild -eDISTRIB -eSECTION -eLIBNVIDIA_CONTAINER_TOOLS_VERSION -eVERSION="${REVISION}" \ debuild -eDISTRIB -eSECTION -eLIBNVIDIA_CONTAINER_TOOLS_VERSION -eVERSION="${REVISION}" \
--dpkg-buildpackage-hook='sh debian/prepare' -i -us -uc -b && \ --dpkg-buildpackage-hook='sh debian/prepare' -i -us -uc -b && \
mv /tmp/nvidia-container-toolkit_*.deb /dist mv /tmp/*.deb /dist

2
third_party/libnvidia-container vendored

@ -1 +1 @@
Subproject commit 2ef666498c95f759290016cc7cbcf76ce9abcaac Subproject commit c8f267be0bac1c654d59ad4ea5df907141149977

4
versions.mk
View File

@ -14,7 +14,7 @@
LIB_NAME := nvidia-container-toolkit LIB_NAME := nvidia-container-toolkit
LIB_VERSION := 1.11.0 LIB_VERSION := 1.11.0
LIB_TAG := rc.3 LIB_TAG :=
# Specify the nvidia-docker2 and nvidia-container-runtime package versions. # Specify the nvidia-docker2 and nvidia-container-runtime package versions.
# Note: The tag is automatically specified to match LIB_TAG. # Note: The tag is automatically specified to match LIB_TAG.
@ -27,4 +27,4 @@ LIBNVIDIA_CONTAINER0_VERSION := 0.10.0+jetpack
CUDA_VERSION := 11.7.1 CUDA_VERSION := 11.7.1
GOLANG_VERSION := 1.17.8 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 "")