Skip to content

Commit 685cff8

Browse files
committed
TOFIX
Signed-off-by: Evan Lezar <[email protected]>
1 parent 8a85cad commit 685cff8

File tree

3 files changed

+30
-4
lines changed

3 files changed

+30
-4
lines changed

.dockerignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
.git
22
/shared-*
3+
release-v*/**

deployments/container/Dockerfile

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,32 @@ ARG VERSION="N/A"
5353
ARG GIT_COMMIT="unknown"
5454
RUN make PREFIX=/artifacts/bin cmd-nvidia-ctk-installer
5555

56+
#
57+
FROM nvcr.io/nvidia/cuda:13.0.1-base-ubi9 AS rpmdigests
58+
59+
ARG ARTIFACTS_ROOT
60+
COPY ${ARTIFACTS_ROOT} /artifacts/packages/
61+
62+
WORKDIR /artifacts
63+
64+
RUN dnf install -y rubygems \
65+
ruby-devel \
66+
yum-utils \
67+
rpm-build \
68+
&& gem install --no-document fpm
69+
70+
WORKDIR /artifacts/packages
71+
72+
RUN mv centos7 centos7-src; mkdir -p centos7; cd centos7-src; \
73+
for arch in $(ls); do \
74+
mkdir -p /artifacts/packages/centos7/$arch; \
75+
cd /artifacts/packages/centos7/$arch; \
76+
for p in $(ls /artifacts/packages/centos7-src/$arch/*.rpm); do \
77+
fpm -s rpm -t rpm $p; \
78+
done; \
79+
done; \
80+
rm -rf /artifacts/packages/centos7-src
81+
5682
# The packaging stage collects the deb and rpm packages built for
5783
# supported architectures.
5884
FROM nvcr.io/nvidia/distroless/go:v3.2.0-dev AS packaging
@@ -61,10 +87,8 @@ USER 0:0
6187
SHELL ["/busybox/sh", "-c"]
6288
RUN ln -s /busybox/sh /bin/sh
6389

64-
ARG ARTIFACTS_ROOT
65-
COPY ${ARTIFACTS_ROOT} /artifacts/packages/
66-
6790
WORKDIR /artifacts
91+
COPY --from=rpmdigests /artifacts/packages/ packages
6892

6993
# build-args are added to the manifest.txt file below.
7094
ARG PACKAGE_VERSION

docker/Dockerfile.rpm-yum

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ WORKDIR $DIST_DIR/..
7373
COPY packaging/rpm .
7474
COPY deployments/systemd/ ${DIST_DIR}/
7575

76-
CMD arch=$(uname -m) && \
76+
RUN arch=$(uname -m) && \
7777
rpmbuild --clean --target=$arch -bb \
7878
-D "_topdir $PWD" \
7979
-D "release_date $(date +'%a %b %d %Y')" \
@@ -82,3 +82,4 @@ CMD arch=$(uname -m) && \
8282
-D "release ${PKG_REV}" \
8383
SPECS/nvidia-container-toolkit.spec && \
8484
mv RPMS/$arch/*.rpm /dist
85+

0 commit comments

Comments
 (0)