3 files changed, 6 insertions, 1 deletions

diff --git a/docker/Dockerfile b/docker/Dockerfile
index f76f4cf1..b7366229 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -61,4 +61,5 @@ ADD startimap.sh /home/developer/startimap.sh
 ADD keyconfig /home/developer/keyconfig
 ADD setupkolabnowtest.sh /home/developer/setupkolabnowtest.sh
 RUN gpg2 --batch --generate-key /home/developer/keyconfig
-RUN echo "pinentry-program /usr/bin/pinentry-gtk" > /home/developer/.gnupg/gpg-agent.conf
+ADD gpg-agent.conf /home/developer/.gnupg/gpg-agent.conf
+ADD gpg.conf /home/developer/.gnupg/gpg.conf
diff --git a/docker/gpg-agent.conf b/docker/gpg-agent.conf
new file mode 100644
index 00000000..cb5a0dae
--- /dev/null
+++ b/docker/gpg-agent.conf
@@ -0,0 +1 @@
+pinentry-program /usr/bin/pinentry-gtk
diff --git a/docker/gpg.conf b/docker/gpg.conf
new file mode 100644
index 00000000..075d7460
--- /dev/null
+++ b/docker/gpg.conf
@@ -0,0 +1,3 @@
+utf8-strings
+keyserver hkp://pgp.mit.edu
+debug-level basic