From e88018f6f456f1dbb3c895d9de3cbee88275db75 Mon Sep 17 00:00:00 2001 From: Christopher Desiniotis Date: Thu, 29 Feb 2024 11:18:13 -0800 Subject: [PATCH 1/2] Strip 'v' from version string when generating mig-parted packages Signed-off-by: Christopher Desiniotis --- deployments/systemd/packages/Makefile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/deployments/systemd/packages/Makefile b/deployments/systemd/packages/Makefile index 3551b830..87f9f107 100644 --- a/deployments/systemd/packages/Makefile +++ b/deployments/systemd/packages/Makefile @@ -25,6 +25,9 @@ REGISTRY ?= nvcr.io/nvidia IMAGE := $(REGISTRY)/$(NAME) endif +# strip 'v' from version string +PACKAGE_VERSION := $(VERSION:v%=%) + ##### Public rules ##### VALID_TARGETS = tarball ubuntu18.04 ubuntu20.04 ubi8 @@ -35,7 +38,7 @@ all: $(VALID_TARGETS) tarball: $(DOCKER) build --pull \ --build-arg PACKAGE_NAME=$(NAME) \ - --build-arg PACKAGE_VERSION=$(VERSION) \ + --build-arg PACKAGE_VERSION=$(PACKAGE_VERSION) \ --build-arg PACKAGE_REVISION=$(REVISION) \ --build-arg GOLANG_VERSION=$(GOLANG_VERSION) \ --tag $(IMAGE):$(vVERSION)-tarball \ @@ -48,7 +51,7 @@ tarball: ubuntu18.04: $(DOCKER) build --pull \ --build-arg PACKAGE_NAME=$(NAME) \ - --build-arg PACKAGE_VERSION=$(VERSION) \ + --build-arg PACKAGE_VERSION=$(PACKAGE_VERSION) \ --build-arg PACKAGE_REVISION=$(REVISION) \ --build-arg GOLANG_VERSION=$(GOLANG_VERSION) \ --build-arg BASE_IMAGE=nvcr.io/nvidia/cuda:${CUDA_VERSION}-base-ubuntu18.04 \ @@ -62,7 +65,7 @@ ubuntu18.04: ubuntu20.04: $(DOCKER) build --pull \ --build-arg PACKAGE_NAME=$(NAME) \ - --build-arg PACKAGE_VERSION=$(VERSION) \ + --build-arg PACKAGE_VERSION=$(PACKAGE_VERSION) \ --build-arg PACKAGE_REVISION=$(REVISION) \ --build-arg GOLANG_VERSION=$(GOLANG_VERSION) \ --build-arg BASE_IMAGE=nvcr.io/nvidia/cuda:${CUDA_VERSION}-base-ubuntu20.04 \ @@ -76,7 +79,7 @@ ubuntu20.04: ubi8: $(DOCKER) build --pull \ --build-arg PACKAGE_NAME=$(NAME) \ - --build-arg PACKAGE_VERSION=$(VERSION) \ + --build-arg PACKAGE_VERSION=$(PACKAGE_VERSION) \ --build-arg PACKAGE_REVISION=$(REVISION) \ --build-arg GOLANG_VERSION=$(GOLANG_VERSION) \ --build-arg BASE_IMAGE=nvcr.io/nvidia/cuda:${CUDA_VERSION}-base-ubi8 \ From 20fd208945c59c75d017d118b1066b8e54720a7a Mon Sep 17 00:00:00 2001 From: Christopher Desiniotis Date: Thu, 29 Feb 2024 11:21:29 -0800 Subject: [PATCH 2/2] Remove ubuntu18.04 make targets CUDA images are no longer pushing ubuntu18.04 tags starting with CUDA 12.3.2 Signed-off-by: Christopher Desiniotis --- deployments/systemd/packages/Makefile | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/deployments/systemd/packages/Makefile b/deployments/systemd/packages/Makefile index 87f9f107..483ad149 100644 --- a/deployments/systemd/packages/Makefile +++ b/deployments/systemd/packages/Makefile @@ -30,7 +30,7 @@ PACKAGE_VERSION := $(VERSION:v%=%) ##### Public rules ##### -VALID_TARGETS = tarball ubuntu18.04 ubuntu20.04 ubi8 +VALID_TARGETS = tarball ubuntu20.04 ubi8 all: $(VALID_TARGETS) .PHONY: all $(VALID_TARGETS) @@ -48,20 +48,6 @@ tarball: -v $$(pwd)/dist/$(@):/dist \ $(IMAGE):$(vVERSION)-$(@) -ubuntu18.04: - $(DOCKER) build --pull \ - --build-arg PACKAGE_NAME=$(NAME) \ - --build-arg PACKAGE_VERSION=$(PACKAGE_VERSION) \ - --build-arg PACKAGE_REVISION=$(REVISION) \ - --build-arg GOLANG_VERSION=$(GOLANG_VERSION) \ - --build-arg BASE_IMAGE=nvcr.io/nvidia/cuda:${CUDA_VERSION}-base-ubuntu18.04 \ - --tag $(IMAGE):$(vVERSION)-ubuntu18.04 \ - --file Dockerfile.ubuntu \ - $(BUILD_DIR) - $(DOCKER) run \ - -v $$(pwd)/dist/$(@):/dist \ - $(IMAGE):$(vVERSION)-$(@) - ubuntu20.04: $(DOCKER) build --pull \ --build-arg PACKAGE_NAME=$(NAME) \