Move nvidia-toolkit to nvidia-ctk-installer

This change moves the containerized installer from nvidia-toolkit to
cmd/nvidia-ctk-installer to allow for its use in CI.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
This commit is contained in:
Evan Lezar 2025-01-16 16:52:43 +01:00
parent 5cbf3f82d9
commit d953bbb977
No known key found for this signature in database
4 changed files with 14 additions and 14 deletions

View File

@ -42,11 +42,10 @@ ENV PATH=$GOPATH/bin:/usr/local/go/bin:$PATH
WORKDIR /build WORKDIR /build
COPY . . COPY . .
# NOTE: Until the config utilities are properly integrated into the RUN mkdir /artifacts
# nvidia-container-toolkit repository, these are built from the `tools` folder ARG VERSION="N/A"
# and not `cmd`. ARG GIT_COMMIT="unknown"
RUN GOPATH=/artifacts go install -ldflags="-s -w -X 'main.Version=${VERSION}'" ./tools/... RUN make PREFIX=/artifacts cmd-nvidia-ctk-installer
FROM nvidia/cuda:12.6.3-base-ubi8 FROM nvidia/cuda:12.6.3-base-ubi8
@ -72,7 +71,8 @@ RUN PACKAGE_ARCH=${PACKAGE_ARCH/amd64/x86_64} && PACKAGE_ARCH=${PACKAGE_ARCH/arm
WORKDIR /work WORKDIR /work
COPY --from=build /artifacts/bin /work COPY --from=build /artifacts/nvidia-ctk-installer /work/nvidia-ctk-installer
RUN ln -s nvidia-ctk-installer nvidia-toolkit
ENV PATH=/work:$PATH ENV PATH=/work:$PATH
@ -87,4 +87,4 @@ LABEL description="See summary"
RUN mkdir /licenses && mv /NGC-DL-CONTAINER-LICENSE /licenses/NGC-DL-CONTAINER-LICENSE RUN mkdir /licenses && mv /NGC-DL-CONTAINER-LICENSE /licenses/NGC-DL-CONTAINER-LICENSE
ENTRYPOINT ["/work/nvidia-toolkit"] ENTRYPOINT ["/work/nvidia-ctk-installer"]

View File

@ -41,11 +41,10 @@ ENV PATH=$GOPATH/bin:/usr/local/go/bin:$PATH
WORKDIR /build WORKDIR /build
COPY . . COPY . .
# NOTE: Until the config utilities are properly integrated into the RUN mkdir /artifacts
# nvidia-container-toolkit repository, these are built from the `tools` folder ARG VERSION="N/A"
# and not `cmd`. ARG GIT_COMMIT="unknown"
RUN GOPATH=/artifacts go install -ldflags="-s -w -X 'main.Version=${VERSION}'" ./tools/... RUN make PREFIX=/artifacts cmd-nvidia-ctk-installer
FROM nvcr.io/nvidia/cuda:12.6.3-base-ubuntu20.04 FROM nvcr.io/nvidia/cuda:12.6.3-base-ubuntu20.04
@ -80,7 +79,8 @@ RUN dpkg -i \
WORKDIR /work WORKDIR /work
COPY --from=build /artifacts/bin /work/ COPY --from=build /artifacts/nvidia-ctk-installer /work/nvidia-ctk-installer
RUN ln -s nvidia-ctk-installer nvidia-toolkit
ENV PATH=/work:$PATH ENV PATH=/work:$PATH
@ -95,4 +95,4 @@ LABEL description="See summary"
RUN mkdir /licenses && mv /NGC-DL-CONTAINER-LICENSE /licenses/NGC-DL-CONTAINER-LICENSE RUN mkdir /licenses && mv /NGC-DL-CONTAINER-LICENSE /licenses/NGC-DL-CONTAINER-LICENSE
ENTRYPOINT ["/work/nvidia-toolkit"] ENTRYPOINT ["/work/nvidia-ctk-installer"]