From eaa0449f6028dca6d2055fcbda5fc96ee08718ad Mon Sep 17 00:00:00 2001
From: Danilo Bargen <mail@dbrgn.ch>
Date: Fri, 4 Sep 2015 14:03:09 +0200
Subject: [PATCH] Commented Dockerfile, added .dockerignore

---
 .dockerignore |  2 ++
 Dockerfile    | 15 ++++++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 .dockerignore

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 000000000..c676d6990
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,2 @@
+Dockerfile
+Vagrantfile
diff --git a/Dockerfile b/Dockerfile
index 7c29e8f8c..84781656e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,26 +1,35 @@
 FROM ubuntu:14.04
 
+# Install dependencies
 RUN apt-get update -y
 RUN apt-get install -y openssl python-imaging python-jinja2 python-lxml libxml2-dev libxslt1-dev python-pgpdump
 
+# Add code
 WORKDIR /Mailpile
 ADD . /Mailpile
 
-RUN	groupadd -r mailpile \
-&&  mkdir -p /mailpile-data/.gnupg \
-&&	useradd -r -d /mailpile-data -g mailpile mailpile
+# Create users and groups
+RUN groupadd -r mailpile \
+    && mkdir -p /mailpile-data/.gnupg \
+    && useradd -r -d /mailpile-data -g mailpile mailpile
 
+# Add GnuPG placeholder file
 RUN touch /mailpile-data/.gnupg/docker_placeholder
 
+# Fix permissions
 RUN chown -R mailpile:mailpile /Mailpile
 RUN chown -R mailpile:mailpile /mailpile-data
 
+# Run as non-privileged user
 USER mailpile
 
+# Initialize mailpile
 RUN ./mp setup
 
+# Entrypoint
 CMD ./mp --www=0.0.0.0:33411 --wait
 EXPOSE 33411
 
+# Volumes
 VOLUME /mailpile-data/.local/share/Mailpile
 VOLUME /mailpile-data/.gnupg