Fix DISTRIB, add changelog for a stable release date

base/Dockerfile.debian

@@ -3,10 +3,10 @@ FROM debian:${VERSION_ID}
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
         wget \
-	ca-certificates \
-	git \
-	build-essential \
-	dh-make \
+        ca-certificates \
+        git \
+        build-essential \
+        dh-make \
         fakeroot \
         devscripts && \
     rm -rf /var/lib/apt/lists/*

base/Dockerfile.ubuntu

@@ -3,12 +3,13 @@ FROM ubuntu:${VERSION_ID}
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
         wget \
-	ca-certificates \
-	git \
-	build-essential \
-	dh-make \
+        ca-certificates \
+        git \
+        build-essential \
+        dh-make \
         fakeroot \
-        devscripts && \
+        devscripts \
+        lsb-release && \
     rm -rf /var/lib/apt/lists/*
 
 ARG GOLANG_VERSION=0.0.0

hook/Dockerfile.debian

@@ -9,7 +9,6 @@ ARG PKG_ARCH
 ENV DEBFULLNAME "NVIDIA CORPORATION"
 ENV DEBEMAIL "cudatools@nvidia.com"
 ENV REVISION "$PKG_VERS-$PKG_REV"
-ENV DISTRIB "UNRELEASED"
 ENV SECTION ""
 
 # output directory
@@ -27,8 +26,8 @@ COPY config.toml.debian $DIST_DIR/config.toml
 WORKDIR $DIST_DIR
 COPY debian ./debian
 
-RUN dch --create --package nvidia-container-runtime-hook -v "$REVISION" "v$REVISION" -D "$DISTRIB" && \
-    dch -r ""
+RUN if [ "$REVISION" != "$(dpkg-parsechangelog --show-field=Version)" ]; then exit 1; fi
 
-CMD debuild -eSECTION --dpkg-buildpackage-hook='sh debian/prepare' -i -us -uc -b && \
+CMD export DISTRIB="unstable" && \
+    debuild -eDISTRIB -eSECTION --dpkg-buildpackage-hook='sh debian/prepare' -i -us -uc -b && \
     mv /tmp/nvidia-container-runtime-hook_*.deb /dist

hook/Dockerfile.ubuntu

@@ -9,7 +9,6 @@ ARG PKG_ARCH
 ENV DEBFULLNAME "NVIDIA CORPORATION"
 ENV DEBEMAIL "cudatools@nvidia.com"
 ENV REVISION "$PKG_VERS-$PKG_REV"
-ENV DISTRIB "UNRELEASED"
 ENV SECTION ""
 
 # output directory
@@ -27,8 +26,8 @@ COPY config.toml.ubuntu $DIST_DIR/config.toml
 WORKDIR $DIST_DIR
 COPY debian ./debian
 
-RUN dch --create --package nvidia-container-runtime-hook -v "$REVISION" "v$REVISION" -D "$DISTRIB" && \
-    dch -r ""
+RUN if [ "$REVISION" != "$(dpkg-parsechangelog --show-field=Version)" ]; then exit 1; fi
 
-CMD debuild -eSECTION --dpkg-buildpackage-hook='sh debian/prepare' -i -us -uc -b && \
+CMD export DISTRIB="$(lsb_release -cs)" && \
+    debuild -eDISTRIB -eSECTION --dpkg-buildpackage-hook='sh debian/prepare' -i -us -uc -b && \
     mv /tmp/*.deb /dist

hook/debian/changelog

+nvidia-container-runtime-hook (1.2.1-1) UNRELEASED; urgency=medium
+
+  * Extract hook from nvidia-container-runtime package
+
+ -- NVIDIA CORPORATION <cudatools@nvidia.com>  Wed, 07 Mar 2018 02:43:03 +0000

hook/debian/prepare

-#! /bin/sh
+#! /bin/bash
 
 set -e
 
 sed -i "s;@SECTION@;${SECTION:+$SECTION/};g" debian/control
+
+if [ -n "$DISTRIB" ]; then
+    sed -i "s;UNRELEASED;$DISTRIB;" debian/changelog
+fi

runtime/Dockerfile.debian

@@ -25,7 +25,6 @@ ARG PKG_ARCH
 ENV DEBFULLNAME "NVIDIA CORPORATION"
 ENV DEBEMAIL "cudatools@nvidia.com"
 ENV REVISION "$PKG_VERS-$PKG_REV"
-ENV DISTRIB "UNRELEASED"
 ENV SECTION ""
 
 # output directory
@@ -44,8 +43,9 @@ RUN git checkout $RUNC_COMMIT && \
 WORKDIR $DIST_DIR
 COPY debian ./debian
 
-RUN dch --create --package nvidia-container-runtime -v "$REVISION" "v$REVISION" -D "$DISTRIB" && \
-    dch -r ""
+RUN sed -i "s;@VERSION@;${REVISION#*+};" debian/changelog && \
+    if [ "$REVISION" != "$(dpkg-parsechangelog --show-field=Version)" ]; then exit 1; fi
 
-CMD debuild -eSECTION --dpkg-buildpackage-hook='sh debian/prepare' -i -us -uc -b && \
+CMD export DISTRIB="unstable" && \
+    debuild -eDISTRIB -eSECTION --dpkg-buildpackage-hook='sh debian/prepare' -i -us -uc -b && \
     mv /tmp/nvidia-container-runtime_*.deb /dist

runtime/Dockerfile.ubuntu

@@ -25,7 +25,6 @@ ARG PKG_ARCH
 ENV DEBFULLNAME "NVIDIA CORPORATION"
 ENV DEBEMAIL "cudatools@nvidia.com"
 ENV REVISION "$PKG_VERS-$PKG_REV"
-ENV DISTRIB "UNRELEASED"
 ENV SECTION ""
 
 # output directory
@@ -44,8 +43,9 @@ RUN git checkout $RUNC_COMMIT && \
 WORKDIR $DIST_DIR
 COPY debian ./debian
 
-RUN dch --create --package nvidia-container-runtime -v "$REVISION" "v$REVISION" -D "$DISTRIB" && \
-    dch -r ""
+RUN sed -i "s;@VERSION@;${REVISION#*+};" debian/changelog && \
+    if [ "$REVISION" != "$(dpkg-parsechangelog --show-field=Version)" ]; then exit 1; fi
 
-CMD debuild -eSECTION --dpkg-buildpackage-hook='sh debian/prepare' -i -us -uc -b && \
+CMD export DISTRIB="$(lsb_release -cs)" && \
+    debuild -eREVISION -eDISTRIB -eSECTION --dpkg-buildpackage-hook='sh debian/prepare' -i -us -uc -b && \
     mv /tmp/*.deb /dist

runtime/debian/changelog

+nvidia-container-runtime (2.0.0+@VERSION@) UNRELEASED; urgency=medium
+
+  * Split into nvidia-container-runtime and nvidia-container-runtime-hook
+
+ -- NVIDIA CORPORATION <cudatools@nvidia.com>  Wed, 07 Mar 2018 05:47:37 +0000

runtime/debian/prepare

-#! /bin/sh
+#! /bin/bash
 
 set -e
 
 sed -i "s;@SECTION@;${SECTION:+$SECTION/};g" debian/control
+
+if [ -n "$DISTRIB" ]; then
+    sed -i "s;UNRELEASED;$DISTRIB;" debian/changelog
+fi