UniqAI/nvidia-container-toolkit
1
0
Fork 0
mirror of https://github.com/NVIDIA/nvidia-container-toolkit synced 2025-04-22 07:05:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update build system to accept a TAG variable for things like rc.x

Browse Source 
Signed-off-by: Kevin Klues <kklues@nvidia.com>
This commit is contained in:
Kevin Klues 2020-07-24 19:47:38 +00:00
parent bf342fb4c9
commit b50d86c174
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -6,6 +6,7 @@ DIST_DIR ?= $(CURDIR)/dist
LIB_NAME := nvidia-container-toolkit LIB_NAME := nvidia-container-toolkit
LIB_VERSION := 1.2.1 LIB_VERSION := 1.2.1
LIB_TAG ?=
GOLANG_VERSION := 1.14.2 GOLANG_VERSION := 1.14.2
GOLANG_PKG_PATH := github.com/NVIDIA/nvidia-container-toolkit/pkg GOLANG_PKG_PATH := github.com/NVIDIA/nvidia-container-toolkit/pkg

10
docker.mk
View File

@ -75,28 +75,30 @@ docker-all: $(AMD64_TARGETS) $(X86_64_TARGETS) \
# private ubuntu target # private ubuntu target
--ubuntu%: OS := ubuntu --ubuntu%: OS := ubuntu
--ubuntu%: LIB_VERSION := $(LIB_VERSION)$(if $(LIB_TAG),~$(LIB_TAG))
--ubuntu%: PKG_REV := 1 --ubuntu%: PKG_REV := 1
# private debian target # private debian target
--debian%: OS := debian --debian%: OS := debian
--debian%: LIB_VERSION := $(LIB_VERSION)$(if $(LIB_TAG),~$(LIB_TAG))
--debian%: PKG_REV := 1 --debian%: PKG_REV := 1
# private centos target # private centos target
--centos%: OS := centos --centos%: OS := centos
--centos%: PKG_REV := 2 --centos%: PKG_REV := $(if $(LIB_TAG),0.1.$(LIB_TAG),2)
# private amazonlinux target # private amazonlinux target
--amazonlinux%: OS := amazonlinux --amazonlinux%: OS := amazonlinux
--amazonlinux%: PKG_REV = 2.amzn$(VERSION) --amazonlinux%: PKG_REV = $(if $(LIB_TAG),0.1.$(LIB_TAG).amzn$(VERSION),2.amzn$(VERSION))
# private opensuse-leap target # private opensuse-leap target
--opensuse-leap%: OS = opensuse-leap --opensuse-leap%: OS = opensuse-leap
--opensuse-leap%: BASEIMAGE = opensuse/leap:$(VERSION) --opensuse-leap%: BASEIMAGE = opensuse/leap:$(VERSION)
--opensuse-leap%: PKG_REV := 1 --opensuse-leap%: PKG_REV := $(if $(LIB_TAG),0.1.$(LIB_TAG),1)
# private rhel target (actually built on centos) # private rhel target (actually built on centos)
--rhel%: OS := centos --rhel%: OS := centos
--rhel%: PKG_REV := 2 --rhel%: PKG_REV := $(if $(LIB_TAG),0.1.$(LIB_TAG),2)
--rhel%: VERSION = $(patsubst rhel%-$(ARCH),%,$(TARGET_PLATFORM)) --rhel%: VERSION = $(patsubst rhel%-$(ARCH),%,$(TARGET_PLATFORM))
--rhel%: ARTIFACTS_DIR = $(DIST_DIR)/rhel$(VERSION)/$(ARCH) --rhel%: ARTIFACTS_DIR = $(DIST_DIR)/rhel$(VERSION)/$(ARCH)