Ensure runtime requires latest version of toolkit

Signed-off-by: Renaud Gaubert <rgaubert@nvidia.com>
NVIDIA · Jul 23, 2019 · dc6b7df · dc6b7df
1 parent 027d6c8
commit dc6b7df
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/runtime/debian/control b/runtime/debian/control
@@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 9)
 
 Package: nvidia-container-runtime
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, nvidia-container-toolkit (<< 2.0.0), libseccomp2
+Depends: ${shlibs:Depends}, ${misc:Depends}, nvidia-container-toolkit (>= 1.0.1), nvidia-container-toolkit (<< 2.0.0), libseccomp2
 Description: NVIDIA container runtime
  Provides a modified version of runc allowing users to run GPU enabled
  containers.
diff --git a/runtime/rpm/SPECS/nvidia-container-runtime.spec b/runtime/rpm/SPECS/nvidia-container-runtime.spec
@@ -15,7 +15,7 @@ Source0: nvidia-container-runtime
 Source1: LICENSE
 
 Obsoletes: nvidia-container-runtime < 2.0.0
-Requires: nvidia-container-toolkit < 2.0.0
+Requires: nvidia-container-toolkit >= 1.0.1, nvidia-container-toolkit < 2.0.0
 Requires: libseccomp
 
 %description

diff --git a/toolkit/Dockerfile.debian b/toolkit/Dockerfile.debian
@@ -30,7 +30,8 @@ RUN if [ "$(lsb_release -cs)" = "jessie" ]; then \
 WORKDIR $DIST_DIR
 COPY debian ./debian
 
-RUN if [ "$REVISION" != "$(dpkg-parsechangelog --show-field=Version)" ]; then exit 1; fi
+RUN sed -i "s;@VERSION@;${REVISION};" debian/changelog && \
+    if [ "$REVISION" != "$(dpkg-parsechangelog --show-field=Version)" ]; then exit 1; fi
 
 CMD export DISTRIB="unstable" && \
     debuild -eDISTRIB -eSECTION --dpkg-buildpackage-hook='sh debian/prepare' -i -us -uc -b && \

diff --git a/toolkit/Dockerfile.ubuntu b/toolkit/Dockerfile.ubuntu
@@ -25,7 +25,8 @@ COPY config.toml.ubuntu $DIST_DIR/config.toml
 WORKDIR $DIST_DIR
 COPY debian ./debian
 
-RUN if [ "$REVISION" != "$(dpkg-parsechangelog --show-field=Version)" ]; then exit 1; fi
+RUN sed -i "s;@VERSION@;${REVISION};" debian/changelog && \
+    if [ "$REVISION" != "$(dpkg-parsechangelog --show-field=Version)" ]; then exit 1; fi
 
 CMD export DISTRIB="$(lsb_release -cs)" && \
     debuild -eDISTRIB -eSECTION --dpkg-buildpackage-hook='sh debian/prepare' -i -us -uc -b && \

diff --git a/toolkit/debian/changelog b/toolkit/debian/changelog
@@ -1,4 +1,4 @@
-nvidia-container-toolkit (1.0.0-1) UNRELEASED; urgency=medium
+nvidia-container-toolkit (@VERSION@) UNRELEASED; urgency=medium
 
   * Initial release. Replaces older package nvidia-container-runtime-hook. (Closes: #XXXXXX)