maxmustermann/nvidia-docker
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix DISTRIB, add changelog for a stable release date

Browse source
This commit is contained in:
Felix Abecassis 2018-03-07 14:31:20 -08:00
parent 574bdc202b
commit 3f86d28776
3 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Dockerfile.debian
View file

@ -20,7 +20,6 @@ ENV DEBEMAIL "cudatools@nvidia.com"
ENV REVISION "$PKG_VERS-$PKG_REV"
ENV RUNTIME_VERSION $RUNTIME_VERSION
ENV DOCKER_VERSION $DOCKER_VERSION
ENV DISTRIB "UNRELEASED"
ENV SECTION ""
# output directory
@ -34,8 +33,9 @@ COPY daemon.json $DIST_DIR/daemon.json
WORKDIR $DIST_DIR
COPY debian ./debian
RUN dch --create --package nvidia-docker2 -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 --preserve-env --dpkg-buildpackage-hook='sh debian/prepare' -i -us -uc -b && \
CMD export DISTRIB="unstable" && \
debuild --preserve-env --dpkg-buildpackage-hook='sh debian/prepare' -i -us -uc -b && \
mv /tmp/*.deb /dist

12
Dockerfile.ubuntu
View file

@ -6,7 +6,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
dh-make \
fakeroot \
build-essential \
devscripts && \
devscripts \
lsb-release && \
rm -rf /var/lib/apt/lists/*
# packaging
@ -20,7 +21,6 @@ ENV DEBEMAIL "cudatools@nvidia.com"
ENV REVISION "$PKG_VERS-$PKG_REV"
ENV RUNTIME_VERSION $RUNTIME_VERSION
ENV DOCKER_VERSION $DOCKER_VERSION
ENV DISTRIB "UNRELEASED"
ENV SECTION ""
# output directory
@ -34,8 +34,10 @@ COPY daemon.json $DIST_DIR/daemon.json
WORKDIR $DIST_DIR
COPY debian ./debian
RUN dch --create --package nvidia-docker2 -v "$REVISION" "v$REVISION" -D "$DISTRIB" && \
dch -r ""
CMD debuild --preserve-env --dpkg-buildpackage-hook='sh debian/prepare' -i -us -uc -b && \
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 --preserve-env --dpkg-buildpackage-hook='sh debian/prepare' -i -us -uc -b && \
mv /tmp/*.deb /dist

6
debian/changelog vendored Normal file
View file

@ -0,0 +1,6 @@
nvidia-docker2 (2.0.3+@VERSION@) UNRELEASED; urgency=medium
* 2e9f20b Improve pass-through of docker arguments
* 4edca2f Pave the way for a hypothetical transitional package from v1
-- NVIDIA CORPORATION <cudatools@nvidia.com> Wed, 07 Mar 2018 04:06:38 +0000