[Git][reproducible-builds/diffoscope][master] 4 commits: Correct ARG setup in Dockerfile.

[Chris Lamb]

Chris Lamb pushed to branch master at Reproducible Builds / diffoscope


Commits:
27ba87b8 by Chris Lamb at 2020-05-12T10:13:38+01:00
Correct ARG setup in Dockerfile.

Gbp-Dch: ignore

- - - - -
fed348bc by Chris Lamb at 2020-05-12T10:16:46+01:00
Run diffoscope as a non-root user in container. Thanks, Emanuel Bronshtein. (Closes: reproducible-builds/diffoscope#102)

- - - - -
ee50b586 by Chris Lamb at 2020-05-12T10:16:46+01:00
Add a .dockerignore file whitelist files we need in our container. Thanks to Emanuel Bronshtein for the original idea. (Closes: reproducible-builds/diffoscope#105)

- - - - -
e779fe60 by Chris Lamb at 2020-05-12T10:50:48+01:00
Install/remove build-essential during build so we can install the recommended packages from Git.

- - - - -


2 changed files:

- + .dockerignore
- Dockerfile


Changes:

=====================================
.dockerignore
=====================================
@@ -0,0 +1,4 @@
+*
+!bin/
+!debian/
+!diffoscope/


=====================================
Dockerfile
=====================================
@@ -1,15 +1,19 @@
 FROM debian:sid
 
-ARG DEBIAN_FRONTEND noninteractive
+ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && apt-get dist-upgrade --yes
-RUN apt-get install --yes --no-install-recommends devscripts equivs
+RUN apt-get install --yes --no-install-recommends build-essential devscripts equivs
 
 ADD [".", "/srv/diffoscope"]
 RUN mk-build-deps --install --tool 'apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends --yes' /srv/diffoscope/debian/control
 
-RUN apt-get remove --purge --yes devscripts equivs
-RUN apt-get autoremove --purge --yes
+RUN apt-get remove --purge --yes build-essential devscripts equivs
+RUN rm -rf /srv/diffoscope/debian
+
+RUN useradd -ms /bin/bash user
+USER user
+WORKDIR /home/user
 
 ENV PATH="/srv/diffoscope/bin:${PATH}"
 



View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/compare/7c45086d64ae8e1417aa2699dfe11d1abcb34f18...e779fe60ab94f0cb8cc094e827f2626e41e76ee1

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/compare/7c45086d64ae8e1417aa2699dfe11d1abcb34f18...e779fe60ab94f0cb8cc094e827f2626e41e76ee1
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/20200512/61dd4f04/attachment.htm>