Skip to content

Commit d953bbb

Browse files
committed
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 <[email protected]>
1 parent 5cbf3f8 commit d953bbb

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

deployments/container/Dockerfile.ubi8

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,10 @@ ENV PATH=$GOPATH/bin:/usr/local/go/bin:$PATH
4242
WORKDIR /build
4343
COPY . .
4444

45-
# NOTE: Until the config utilities are properly integrated into the
46-
# nvidia-container-toolkit repository, these are built from the `tools` folder
47-
# and not `cmd`.
48-
RUN GOPATH=/artifacts go install -ldflags="-s -w -X 'main.Version=${VERSION}'" ./tools/...
49-
45+
RUN mkdir /artifacts
46+
ARG VERSION="N/A"
47+
ARG GIT_COMMIT="unknown"
48+
RUN make PREFIX=/artifacts cmd-nvidia-ctk-installer
5049

5150
FROM nvidia/cuda:12.6.3-base-ubi8
5251

@@ -72,7 +71,8 @@ RUN PACKAGE_ARCH=${PACKAGE_ARCH/amd64/x86_64} && PACKAGE_ARCH=${PACKAGE_ARCH/arm
7271

7372
WORKDIR /work
7473

75-
COPY --from=build /artifacts/bin /work
74+
COPY --from=build /artifacts/nvidia-ctk-installer /work/nvidia-ctk-installer
75+
RUN ln -s nvidia-ctk-installer nvidia-toolkit
7676

7777
ENV PATH=/work:$PATH
7878

@@ -87,4 +87,4 @@ LABEL description="See summary"
8787

8888
RUN mkdir /licenses && mv /NGC-DL-CONTAINER-LICENSE /licenses/NGC-DL-CONTAINER-LICENSE
8989

90-
ENTRYPOINT ["/work/nvidia-toolkit"]
90+
ENTRYPOINT ["/work/nvidia-ctk-installer"]

deployments/container/Dockerfile.ubuntu

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,10 @@ ENV PATH=$GOPATH/bin:/usr/local/go/bin:$PATH
4141
WORKDIR /build
4242
COPY . .
4343

44-
# NOTE: Until the config utilities are properly integrated into the
45-
# nvidia-container-toolkit repository, these are built from the `tools` folder
46-
# and not `cmd`.
47-
RUN GOPATH=/artifacts go install -ldflags="-s -w -X 'main.Version=${VERSION}'" ./tools/...
48-
44+
RUN mkdir /artifacts
45+
ARG VERSION="N/A"
46+
ARG GIT_COMMIT="unknown"
47+
RUN make PREFIX=/artifacts cmd-nvidia-ctk-installer
4948

5049
FROM nvcr.io/nvidia/cuda:12.6.3-base-ubuntu20.04
5150

@@ -80,7 +79,8 @@ RUN dpkg -i \
8079

8180
WORKDIR /work
8281

83-
COPY --from=build /artifacts/bin /work/
82+
COPY --from=build /artifacts/nvidia-ctk-installer /work/nvidia-ctk-installer
83+
RUN ln -s nvidia-ctk-installer nvidia-toolkit
8484

8585
ENV PATH=/work:$PATH
8686

@@ -95,4 +95,4 @@ LABEL description="See summary"
9595

9696
RUN mkdir /licenses && mv /NGC-DL-CONTAINER-LICENSE /licenses/NGC-DL-CONTAINER-LICENSE
9797

98-
ENTRYPOINT ["/work/nvidia-toolkit"]
98+
ENTRYPOINT ["/work/nvidia-ctk-installer"]

0 commit comments

Comments
 (0)