mirror of
				https://github.com/NVIDIA/nvidia-container-toolkit
				synced 2025-06-26 18:18:24 +00:00 
			
		
		
		
	Merge branch 'fix-devel-release-version' into 'master'
Rename RELEASE_DEVEL_TAG for consistency See merge request nvidia/container-toolkit/container-toolkit!64
This commit is contained in:
		
						commit
						55328126c6
					
				@ -29,7 +29,7 @@ variables:
 | 
			
		||||
  DOCKER_TLS_CERTDIR: "/certs"
 | 
			
		||||
  # Release "devel"-tagged images off the master branch
 | 
			
		||||
  RELEASE_DEVEL_BRANCH: "master"
 | 
			
		||||
  RELEASE_DEVEL_TAG: "devel"
 | 
			
		||||
  DEVEL_RELEASE_IMAGE_VERSION: "devel"
 | 
			
		||||
  # On the multi-arch builder we don't need the qemu setup.
 | 
			
		||||
  SKIP_QEMU_SETUP: "1"
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -50,8 +50,8 @@ $(PUSH_TARGETS): push-%:
 | 
			
		||||
 | 
			
		||||
# For the default push target we also push a short tag equal to the version.
 | 
			
		||||
# We skip this for the development release
 | 
			
		||||
RELEASE_DEVEL_TAG ?= devel
 | 
			
		||||
ifneq ($(strip $(VERSION)),$(RELEASE_DEVEL_TAG))
 | 
			
		||||
DEVEL_RELEASE_IMAGE_VERSION ?= devel
 | 
			
		||||
ifneq ($(strip $(VERSION)),$(DEVEL_RELEASE_IMAGE_VERSION))
 | 
			
		||||
push-$(DEFAULT_PUSH_TARGET): push-short
 | 
			
		||||
endif
 | 
			
		||||
push-short:
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user