Skip to content

Commit b50d86c

Browse files
committed
Update build system to accept a TAG variable for things like rc.x
Signed-off-by: Kevin Klues <kklues@nvidia.com>
1 parent bf342fb commit b50d86c

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ DIST_DIR ?= $(CURDIR)/dist
66

77
LIB_NAME := nvidia-container-toolkit
88
LIB_VERSION := 1.2.1
9+
LIB_TAG ?=
910

1011
GOLANG_VERSION := 1.14.2
1112
GOLANG_PKG_PATH := github.com/NVIDIA/nvidia-container-toolkit/pkg

docker.mk

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,28 +75,30 @@ docker-all: $(AMD64_TARGETS) $(X86_64_TARGETS) \
7575

7676
# private ubuntu target
7777
--ubuntu%: OS := ubuntu
78+
--ubuntu%: LIB_VERSION := $(LIB_VERSION)$(if $(LIB_TAG),~$(LIB_TAG))
7879
--ubuntu%: PKG_REV := 1
7980

8081
# private debian target
8182
--debian%: OS := debian
83+
--debian%: LIB_VERSION := $(LIB_VERSION)$(if $(LIB_TAG),~$(LIB_TAG))
8284
--debian%: PKG_REV := 1
8385

8486
# private centos target
8587
--centos%: OS := centos
86-
--centos%: PKG_REV := 2
88+
--centos%: PKG_REV := $(if $(LIB_TAG),0.1.$(LIB_TAG),2)
8789

8890
# private amazonlinux target
8991
--amazonlinux%: OS := amazonlinux
90-
--amazonlinux%: PKG_REV = 2.amzn$(VERSION)
92+
--amazonlinux%: PKG_REV = $(if $(LIB_TAG),0.1.$(LIB_TAG).amzn$(VERSION),2.amzn$(VERSION))
9193

9294
# private opensuse-leap target
9395
--opensuse-leap%: OS = opensuse-leap
9496
--opensuse-leap%: BASEIMAGE = opensuse/leap:$(VERSION)
95-
--opensuse-leap%: PKG_REV := 1
97+
--opensuse-leap%: PKG_REV := $(if $(LIB_TAG),0.1.$(LIB_TAG),1)
9698

9799
# private rhel target (actually built on centos)
98100
--rhel%: OS := centos
99-
--rhel%: PKG_REV := 2
101+
--rhel%: PKG_REV := $(if $(LIB_TAG),0.1.$(LIB_TAG),2)
100102
--rhel%: VERSION = $(patsubst rhel%-$(ARCH),%,$(TARGET_PLATFORM))
101103
--rhel%: ARTIFACTS_DIR = $(DIST_DIR)/rhel$(VERSION)/$(ARCH)
102104

0 commit comments

Comments
 (0)