[Git][reproducible-builds/diffoscope][master] Build the Docker image from the current Git checkout, not the Debian archive. (Closes: #56)

[Chris Lamb]

Chris Lamb pushed to branch master at Reproducible Builds / diffoscope


Commits:
67aa6952 by Chris Lamb at 2019-06-11T22:28:41Z
Build the Docker image from the current Git checkout, not the Debian archive. (Closes: #56)

- - - - -


2 changed files:

- CONTRIBUTING.rst
- Dockerfile


Changes:

=====================================
CONTRIBUTING.rst
=====================================
@@ -63,7 +63,7 @@ Once the tracker.debian.org entry appears, consider tweeting the release on
 
   %twitter diffoscope $VERSION has been released. Check out the changelog here: $URL
 
-Once the new version lands in the Debian archive, please update the Docker image using::
+Finally, update the Docker image using::
 
     docker build -t registry.salsa.debian.org/reproducible-builds/diffoscope .
     docker push registry.salsa.debian.org/reproducible-builds/diffoscope


=====================================
Dockerfile
=====================================
@@ -2,9 +2,13 @@ FROM debian:sid
 
 ENV DEBIAN_FRONTEND noninteractive
 
-RUN echo deb http://deb.debian.org/debian experimental main >> /etc/apt/sources.list
+RUN apt update && apt dist-upgrade --yes
+RUN apt install --yes --no-install-recommends devscripts equivs
 
-RUN apt-get update && apt-get dist-upgrade --yes
-RUN apt-get install --yes --install-recommends --target-release=experimental diffoscope || apt-get install --yes --install-recommends diffoscope
+ADD [".", "/srv/diffoscope"]
+RUN mk-build-deps --install --tool 'apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends --yes' /srv/diffoscope/debian/control
 
-ENTRYPOINT ["/usr/bin/diffoscope"]
+RUN apt remove --purge --yes devscripts equivs
+RUN apt autoremove --purge --yes
+
+ENTRYPOINT ["/srv/diffoscope/bin/diffoscope"]



View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/commit/67aa6952d137d24566164edd59137d97a3b56144

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/commit/67aa6952d137d24566164edd59137d97a3b56144
You're receiving this email because of your account on salsa.debian.org.

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.reproducible-builds.org/pipermail/rb-commits/attachments/20190612/f8705505/attachment.html>