Skip to content

Commit c6eeac3

Browse files
elezarelezar
committed
Require matching version of libnvidia-container-tools
Signed-off-by: Evan Lezar <[email protected]>
1 parent f93d96a commit c6eeac3

9 files changed

+7
-28
lines changed

‎docker/Dockerfile.debian

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,6 @@ RUN make PREFIX=${DIST_DIR} cmds
5656
WORKDIR $DIST_DIR
5757
COPY packaging/debian ./debian
5858

59-
ARG LIBNVIDIA_CONTAINER_TOOLS_VERSION
60-
ENV LIBNVIDIA_CONTAINER_TOOLS_VERSION ${LIBNVIDIA_CONTAINER_TOOLS_VERSION}
61-
6259
RUN dch --create --package="${PKG_NAME}" \
6360
--newversion "${REVISION}" \
6461
"See https://gitlab.com/nvidia/container-toolkit/container-toolkit/-/blob/${GIT_COMMIT}/CHANGELOG.md for the changelog" && \
@@ -67,6 +64,6 @@ RUN dch --create --package="${PKG_NAME}" \
6764
if [ "$REVISION" != "$(dpkg-parsechangelog --show-field=Version)" ]; then exit 1; fi
6865

6966
CMD export DISTRIB="$(lsb_release -cs)" && \
70-
debuild -eDISTRIB -eSECTION -eLIBNVIDIA_CONTAINER_TOOLS_VERSION -eVERSION="${REVISION}" \
67+
debuild -eDISTRIB -eSECTION -eVERSION="${REVISION}" \
7168
--dpkg-buildpackage-hook='sh debian/prepare' -i -us -uc -b && \
7269
mv /tmp/*.deb /dist

‎docker/Dockerfile.opensuse-leap

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,16 +47,12 @@ RUN make PREFIX=${DIST_DIR} cmds
4747
WORKDIR $DIST_DIR/..
4848
COPY packaging/rpm .
4949

50-
ARG LIBNVIDIA_CONTAINER_TOOLS_VERSION
51-
ENV LIBNVIDIA_CONTAINER_TOOLS_VERSION ${LIBNVIDIA_CONTAINER_TOOLS_VERSION}
52-
5350
CMD arch=$(uname -m) && \
5451
rpmbuild --clean --target=$arch -bb \
5552
-D "_topdir $PWD" \
5653
-D "release_date $(date +'%a %b %d %Y')" \
5754
-D "git_commit ${GIT_COMMIT}" \
5855
-D "version ${PKG_VERS}" \
59-
-D "libnvidia_container_tools_version ${LIBNVIDIA_CONTAINER_TOOLS_VERSION}" \
6056
-D "release ${PKG_REV}" \
6157
SPECS/nvidia-container-toolkit.spec && \
6258
mv RPMS/$arch/*.rpm /dist

‎docker/Dockerfile.rpm-yum

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,16 +72,12 @@ RUN make PREFIX=${DIST_DIR} cmds
7272
WORKDIR $DIST_DIR/..
7373
COPY packaging/rpm .
7474

75-
ARG LIBNVIDIA_CONTAINER_TOOLS_VERSION
76-
ENV LIBNVIDIA_CONTAINER_TOOLS_VERSION ${LIBNVIDIA_CONTAINER_TOOLS_VERSION}
77-
7875
CMD arch=$(uname -m) && \
7976
rpmbuild --clean --target=$arch -bb \
8077
-D "_topdir $PWD" \
8178
-D "release_date $(date +'%a %b %d %Y')" \
8279
-D "git_commit ${GIT_COMMIT}" \
8380
-D "version ${PKG_VERS}" \
84-
-D "libnvidia_container_tools_version ${LIBNVIDIA_CONTAINER_TOOLS_VERSION}" \
8581
-D "release ${PKG_REV}" \
8682
SPECS/nvidia-container-toolkit.spec && \
8783
mv RPMS/$arch/*.rpm /dist

‎docker/Dockerfile.ubuntu

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,17 +54,14 @@ RUN make PREFIX=${DIST_DIR} cmds
5454
WORKDIR $DIST_DIR
5555
COPY packaging/debian ./debian
5656

57-
ARG LIBNVIDIA_CONTAINER_TOOLS_VERSION
58-
ENV LIBNVIDIA_CONTAINER_TOOLS_VERSION ${LIBNVIDIA_CONTAINER_TOOLS_VERSION}
59-
6057
RUN dch --create --package="${PKG_NAME}" \
6158
--newversion "${REVISION}" \
6259
"See https://gitlab.com/nvidia/container-toolkit/container-toolkit/-/blob/${GIT_COMMIT}/CHANGELOG.md for the changelog" && \
63-
dch --append "Bump libnvidia-container dependency to ${LIBNVIDIA_CONTAINER_TOOLS_VERSION}" && \
60+
dch --append "Bump libnvidia-container dependency to ${REVISION}" && \
6461
dch -r "" && \
6562
if [ "$REVISION" != "$(dpkg-parsechangelog --show-field=Version)" ]; then exit 1; fi
6663

6764
CMD export DISTRIB="$(lsb_release -cs)" && \
68-
debuild -eDISTRIB -eSECTION -eLIBNVIDIA_CONTAINER_TOOLS_VERSION -eVERSION="${REVISION}" \
65+
debuild -eDISTRIB -eSECTION -eVERSION="${REVISION}" \
6966
--dpkg-buildpackage-hook='sh debian/prepare' -i -us -uc -b && \
7067
mv /tmp/*.deb /dist

‎docker/docker.mk

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,6 @@ docker-all: $(AMD64_TARGETS) $(X86_64_TARGETS) \
8585
--%: docker-build-%
8686
@
8787

88-
LIBNVIDIA_CONTAINER_VERSION ?= $(LIB_VERSION)
89-
LIBNVIDIA_CONTAINER_TAG ?= $(LIB_TAG)
90-
91-
LIBNVIDIA_CONTAINER_TOOLS_VERSION := $(LIBNVIDIA_CONTAINER_VERSION)$(if $(LIBNVIDIA_CONTAINER_TAG),~$(LIBNVIDIA_CONTAINER_TAG))-1
92-
9388
# private ubuntu target
9489
--ubuntu%: OS := ubuntu
9590

@@ -129,7 +124,6 @@ docker-build-%:
129124
--build-arg PKG_NAME="$(LIB_NAME)" \
130125
--build-arg PKG_VERS="$(PACKAGE_VERSION)" \
131126
--build-arg PKG_REV="$(PACKAGE_REVISION)" \
132-
--build-arg LIBNVIDIA_CONTAINER_TOOLS_VERSION="$(LIBNVIDIA_CONTAINER_TOOLS_VERSION)" \
133127
--build-arg GIT_COMMIT="$(GIT_COMMIT)" \
134128
--tag $(BUILDIMAGE) \
135129
--file $(DOCKERFILE) .

‎packaging/debian/control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 9)
1010

1111
Package: nvidia-container-toolkit
1212
Architecture: any
13-
Depends: ${misc:Depends}, nvidia-container-toolkit-base (= @VERSION@), libnvidia-container-tools (>= @LIBNVIDIA_CONTAINER_TOOLS_VERSION@), libnvidia-container-tools (<< 2.0.0)
13+
Depends: ${misc:Depends}, nvidia-container-toolkit-base (= @VERSION@), (= @VERSION@-1), libnvidia-container-tools (<< 2.0.0)
1414
Breaks: nvidia-container-runtime (<= 3.5.0-1), nvidia-container-runtime-hook
1515
Replaces: nvidia-container-runtime (<= 3.5.0-1), nvidia-container-runtime-hook
1616
Description: NVIDIA Container toolkit

‎packaging/debian/prepare

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
set -e
44

55
sed -i "s;@SECTION@;${SECTION:+$SECTION/};g" debian/control
6-
sed -i "s;@LIBNVIDIA_CONTAINER_TOOLS_VERSION@;${LIBNVIDIA_CONTAINER_TOOLS_VERSION:+$LIBNVIDIA_CONTAINER_TOOLS_VERSION};g" debian/control
76
sed -i "s;@VERSION@;${VERSION:+$VERSION};g" debian/control
87

98
if [ -n "$DISTRIB" ]; then

‎packaging/rpm/SPECS/nvidia-container-toolkit.spec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Source6: nvidia-cdi-hook
2121
Obsoletes: nvidia-container-runtime <= 3.5.0-1, nvidia-container-runtime-hook <= 1.4.0-2
2222
Provides: nvidia-container-runtime
2323
Provides: nvidia-container-runtime-hook
24-
Requires: libnvidia-container-tools >= %{libnvidia_container_tools_version}, libnvidia-container-tools < 2.0.0
24+
Requires: libnvidia-container-tools == %{version}-%{release}-1, libnvidia-container-tools < 2.0.0
2525
Requires: nvidia-container-toolkit-base == %{version}-%{release}
2626

2727
%description
@@ -69,7 +69,7 @@ fi
6969
# As of 1.10.0-1 we generate the release information automatically
7070
* %{release_date} NVIDIA CORPORATION <[email protected]> %{version}-%{release}
7171
- See https://gitlab.com/nvidia/container-toolkit/container-toolkit/-/blob/%{git_commit}/CHANGELOG.md
72-
- Bump libnvidia-container dependency to libnvidia-container-tools >= %{libnvidia_container_tools_version}
72+
- Bump libnvidia-container dependency to libnvidia-container-tools == %{version}-%{release}
7373

7474
# The BASE package consists of the NVIDIA Container Runtime and the NVIDIA Container Toolkit CLI.
7575
# This allows the package to be installed on systems where no NVIDIA Container CLI is available.

‎third_party/libnvidia-container

0 commit comments

Comments
 (0)