diff options
| author | Evan Lezar <7723350-elezar@users.noreply.gitlab.com> | 2022-01-17 16:13:49 +0300 |
|---|---|---|
| committer | Evan Lezar <7723350-elezar@users.noreply.gitlab.com> | 2022-01-17 16:13:49 +0300 |
| commit | 51d3c9e22b2b891773ab9525eaf7b3ce1c014ab1 (patch) | |
| tree | 2e6088a31a06b689fe9072896000e736a5e80b48 | |
| parent | 9d1e41341776ffb58728adbe0f265d68f497e07d (diff) | |
| parent | eb02a7d51a1c8f5c9b285b4e3b3470ca6a4df449 (diff) | |
Merge branch 'fix-lib-tag' into 'master'
Ensure that LIB_TAG can be set as a make variable
See merge request nvidia/container-toolkit/nvidia-docker!36
| -rw-r--r-- | docker/docker.mk | 48 |
1 files changed, 26 insertions, 22 deletions
diff --git a/docker/docker.mk b/docker/docker.mk index 23ce01c..9f2b6ed 100644 --- a/docker/docker.mk +++ b/docker/docker.mk @@ -92,50 +92,54 @@ docker-all: $(AMD64_TARGETS) $(X86_64_TARGETS) \ --%: docker-build-% @ -DEB_LIB_VERSION := $(LIB_VERSION)$(if $(LIB_TAG),~$(LIB_TAG)) -DEB_PKG_REV := 1 -DEB_TOOLKIT_VERSION := $(TOOLKIT_VERSION)$(if $(TOOLKIT_TAG),~$(TOOLKIT_TAG)) -DEB_TOOLKIT_REV := 1 +DEB_LIB_VERSION = $(LIB_VERSION)$(if $(LIB_TAG),~$(LIB_TAG)) +DEB_PKG_REV = 1 +DEB_TOOLKIT_VERSION = $(TOOLKIT_VERSION)$(if $(TOOLKIT_TAG),~$(TOOLKIT_TAG)) +DEB_TOOLKIT_REV = 1 -RPM_LIB_VERSION := $(LIB_VERSION) -RPM_PKG_REV := $(if $(LIB_TAG),0.1.$(LIB_TAG),1) -RPM_TOOLKIT_VERSION := $(TOOLKIT_VERSION) -RPM_TOOLKIT_REV := $(if $(TOOLKIT_TAG),0.1.$(TOOLKIT_TAG),1) +RPM_LIB_VERSION = $(LIB_VERSION) +RPM_PKG_REV = $(if $(LIB_TAG),0.1.$(LIB_TAG),1) +RPM_TOOLKIT_VERSION = $(TOOLKIT_VERSION) +RPM_TOOLKIT_REV = $(if $(TOOLKIT_TAG),0.1.$(TOOLKIT_TAG),1) # private OS targets with defaults # private ubuntu target --ubuntu%: OS := ubuntu ---ubuntu%: LIB_VERSION := $(DEB_LIB_VERSION) ---ubuntu%: PKG_REV := $(DEB_PKG_REV) ---ubuntu%: MIN_TOOLKIT_PKG_VERSION := $(DEB_TOOLKIT_VERSION)-$(DEB_TOOLKIT_REV) +--ubuntu%: PKG_VERS = $(DEB_LIB_VERSION) +--ubuntu%: PKG_REV = $(DEB_PKG_REV) +--ubuntu%: MIN_TOOLKIT_PKG_VERSION = $(DEB_TOOLKIT_VERSION)-$(DEB_TOOLKIT_REV) # private debian target --debian%: OS := debian ---debian%: LIB_VERSION := $(DEB_LIB_VERSION) ---debian%: PKG_REV := $(DEB_PKG_REV) +--debian%: PKG_VERS = $(DEB_LIB_VERSION) +--debian%: PKG_REV = $(DEB_PKG_REV) --debian%: MIN_TOOLKIT_PKG_VERSION = $(DEB_TOOLKIT_VERSION)-$(DEB_TOOLKIT_REV) # private centos target --centos%: OS := centos ---centos%: PKG_REV := $(RPM_PKG_REV) ---centos%: MIN_TOOLKIT_PKG_VERSION := $(RPM_TOOLKIT_VERSION)-$(RPM_TOOLKIT_REV) +--centos%: PKG_VERS = $(LIB_VERSION) +--centos%: PKG_REV = $(RPM_PKG_REV) +--centos%: MIN_TOOLKIT_PKG_VERSION = $(RPM_TOOLKIT_VERSION)-$(RPM_TOOLKIT_REV) # private amazonlinux target --amazonlinux%: OS := amazonlinux ---amazonlinux%: PKG_REV := $(RPM_PKG_REV) ---amazonlinux%: MIN_TOOLKIT_PKG_VERSION := $(RPM_TOOLKIT_VERSION)-$(RPM_TOOLKIT_REV) +--amazonlinux%: PKG_VERS = $(LIB_VERSION) +--amazonlinux%: PKG_REV = $(RPM_PKG_REV) +--amazonlinux%: MIN_TOOLKIT_PKG_VERSION = $(RPM_TOOLKIT_VERSION)-$(RPM_TOOLKIT_REV) # private opensuse-leap target with overrides --opensuse-leap%: OS := opensuse-leap ---opensuse-leap%: PKG_REV := $(RPM_PKG_REV) ---opensuse-leap%: MIN_TOOLKIT_PKG_VERSION := $(RPM_TOOLKIT_VERSION)-$(RPM_TOOLKIT_REV) +--opensuse-leap%: PKG_VERS = $(LIB_VERSION) +--opensuse-leap%: PKG_REV = $(RPM_PKG_REV) +--opensuse-leap%: MIN_TOOLKIT_PKG_VERSION = $(RPM_TOOLKIT_VERSION)-$(RPM_TOOLKIT_REV) --opensuse-leap%: BASEIMAGE = opensuse/leap:$(VERSION) # private rhel target (actually built on centos) --rhel%: OS := centos ---rhel%: PKG_REV := $(RPM_PKG_REV) ---rhel%: MIN_TOOLKIT_PKG_VERSION := $(RPM_TOOLKIT_VERSION)-$(RPM_TOOLKIT_REV) +--rhel%: PKG_VERS = $(LIB_VERSION) +--rhel%: PKG_REV = $(RPM_PKG_REV) +--rhel%: MIN_TOOLKIT_PKG_VERSION = $(RPM_TOOLKIT_VERSION)-$(RPM_TOOLKIT_REV) --rhel%: VERSION = $(patsubst rhel%-$(ARCH),%,$(TARGET_PLATFORM)) --rhel%: ARTIFACTS_DIR = $(DIST_DIR)/rhel$(VERSION)/$(ARCH) @@ -165,7 +169,7 @@ docker-build-%: --build-arg DOCKER_VERSION="$(DOCKER_VERSION)" \ --build-arg TOOLKIT_VERSION="$(MIN_TOOLKIT_PKG_VERSION)" \ --build-arg PKG_NAME="$(LIB_NAME)" \ - --build-arg PKG_VERS="$(LIB_VERSION)" \ + --build-arg PKG_VERS="$(PKG_VERS)" \ --build-arg PKG_REV="$(PKG_REV)" \ --tag $(BUILDIMAGE) \ --file $(DOCKERFILE) . |