Fix make targets which generate mig-parted packages #41
Conversation
Signed-off-by: Christopher Desiniotis <[email protected]>
CUDA images are no longer pushing ubuntu18.04 tags starting with CUDA 12.3.2 Signed-off-by: Christopher Desiniotis <[email protected]>
cdesiniotis
changed the title
| @@ -45,24 +48,10 @@ tarball: | |||
| -v $$(pwd)/dist/$(@):/dist \ | |||
| $(IMAGE):$(vVERSION)-$(@) | |||
|
|
|||
| ubuntu18.04: | |||
There was a problem hiding this comment.
One concern I have here is that this will cause the packages we build to be incompatible with older debian-based systems. Note that these are not deployment images, but the images we use to build the binaries and package them.
This should be aligned with libnvidia-container or the nvidia-container-toolkit.
There was a problem hiding this comment.
I have created #42 to do this. Note that we now have deb and rpm targets in this Makefile for clarity.
There was a problem hiding this comment.
@elezar thanks for working on the follow-up. Are there any pending items for this PR?
There was a problem hiding this comment.
I think my concerns are addressed by #42.
| @@ -25,17 +25,20 @@ REGISTRY ?= nvcr.io/nvidia | |||
| IMAGE := $(REGISTRY)/$(NAME) | |||
| endif | |||
|
|
|||
| # strip 'v' from version string | |||
| PACKAGE_VERSION := $(VERSION:v%=%) | |||
There was a problem hiding this comment.
Out of scope for this PR: in the libnvidia-container and nvidia-container-toolkit packages, I started generating the changelog automatically as part of the build to streamline things. Not sure if that's something we want to try here.
| @@ -45,24 +48,10 @@ tarball: | |||
| -v $$(pwd)/dist/$(@):/dist \ | |||
| $(IMAGE):$(vVERSION)-$(@) | |||
There was a problem hiding this comment.
We seem to pre-pend the v to the VERSION var here. Does this not conflict with the following?
PACKAGE_VERSION := $(VERSION:v%=%)
There was a problem hiding this comment.
vVERSION is a separate variable defined in the top-level versions.mk file and is used when we explicitly want a version string with the leading v. In this case, we are using it when constructing the image tag.
A previous commit, 6d18ec1, added a leading 'v' to our top level VERSION variable in
versions.mk. Since then, building the mig-parted packages fails since thePACKAGE_VERSION(which now has a leading 'v') does not match the version string in our changelogs: https://github.com/NVIDIA/mig-parted/blob/v0.6.0/deployments/systemd/packages/Dockerfile.ubuntu#L53.This PR strips the leading 'v' in the
PACKAGE_VERSIONand removes the ubuntu18.04 make targets since ubuntu18.04 tags are no longer being pushed for CUDA images starting with CUDA 12.3.2.