From d953bbb97770ad5360e8f7f32e85af6aa778ae99 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Thu, 16 Jan 2025 16:52:43 +0100 Subject: [PATCH] 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 --- .../nvidia-ctk-installer}/run.go | 0 .../nvidia-ctk-installer}/run_test.go | 0 deployments/container/Dockerfile.ubi8 | 14 +++++++------- deployments/container/Dockerfile.ubuntu | 14 +++++++------- 4 files changed, 14 insertions(+), 14 deletions(-) rename {tools/container/nvidia-toolkit => cmd/nvidia-ctk-installer}/run.go (100%) rename {tools/container/nvidia-toolkit => cmd/nvidia-ctk-installer}/run_test.go (100%) diff --git a/tools/container/nvidia-toolkit/run.go b/cmd/nvidia-ctk-installer/run.go similarity index 100% rename from tools/container/nvidia-toolkit/run.go rename to cmd/nvidia-ctk-installer/run.go diff --git a/tools/container/nvidia-toolkit/run_test.go b/cmd/nvidia-ctk-installer/run_test.go similarity index 100% rename from tools/container/nvidia-toolkit/run_test.go rename to cmd/nvidia-ctk-installer/run_test.go diff --git a/deployments/container/Dockerfile.ubi8 b/deployments/container/Dockerfile.ubi8 index 08e41e28..825d968d 100644 --- a/deployments/container/Dockerfile.ubi8 +++ b/deployments/container/Dockerfile.ubi8 @@ -42,11 +42,10 @@ ENV PATH=$GOPATH/bin:/usr/local/go/bin:$PATH WORKDIR /build COPY . . -# NOTE: Until the config utilities are properly integrated into the -# nvidia-container-toolkit repository, these are built from the `tools` folder -# and not `cmd`. -RUN GOPATH=/artifacts go install -ldflags="-s -w -X 'main.Version=${VERSION}'" ./tools/... - +RUN mkdir /artifacts +ARG VERSION="N/A" +ARG GIT_COMMIT="unknown" +RUN make PREFIX=/artifacts cmd-nvidia-ctk-installer 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 -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 @@ -87,4 +87,4 @@ LABEL description="See summary" RUN mkdir /licenses && mv /NGC-DL-CONTAINER-LICENSE /licenses/NGC-DL-CONTAINER-LICENSE -ENTRYPOINT ["/work/nvidia-toolkit"] +ENTRYPOINT ["/work/nvidia-ctk-installer"] diff --git a/deployments/container/Dockerfile.ubuntu b/deployments/container/Dockerfile.ubuntu index d71e33e9..b1e08136 100644 --- a/deployments/container/Dockerfile.ubuntu +++ b/deployments/container/Dockerfile.ubuntu @@ -41,11 +41,10 @@ ENV PATH=$GOPATH/bin:/usr/local/go/bin:$PATH WORKDIR /build COPY . . -# NOTE: Until the config utilities are properly integrated into the -# nvidia-container-toolkit repository, these are built from the `tools` folder -# and not `cmd`. -RUN GOPATH=/artifacts go install -ldflags="-s -w -X 'main.Version=${VERSION}'" ./tools/... - +RUN mkdir /artifacts +ARG VERSION="N/A" +ARG GIT_COMMIT="unknown" +RUN make PREFIX=/artifacts cmd-nvidia-ctk-installer FROM nvcr.io/nvidia/cuda:12.6.3-base-ubuntu20.04 @@ -80,7 +79,8 @@ RUN dpkg -i \ 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 @@ -95,4 +95,4 @@ LABEL description="See summary" RUN mkdir /licenses && mv /NGC-DL-CONTAINER-LICENSE /licenses/NGC-DL-CONTAINER-LICENSE -ENTRYPOINT ["/work/nvidia-toolkit"] +ENTRYPOINT ["/work/nvidia-ctk-installer"]