diff options
| author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2017-11-24 17:18:45 +0100 |
|---|---|---|
| committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2017-11-24 17:18:45 +0100 |
| commit | 9eaa740e571aa2167d308bc13ed366e71e122e16 (patch) | |
| tree | 14c817ea53491b51269528457266f4b5f7ed8209 /docker | |
| parent | a7aa889ae94cbec36f8c3ad1b39a57958258b847 (diff) | |
| download | kube-9eaa740e571aa2167d308bc13ed366e71e122e16.tar.gz kube-9eaa740e571aa2167d308bc13ed366e71e122e16.zip | |
Improved gpg conf so we can search for keys
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 3 | ||||
| -rw-r--r-- | docker/gpg-agent.conf | 1 | ||||
| -rw-r--r-- | docker/gpg.conf | 3 |
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 | |||
| 61 | ADD keyconfig /home/developer/keyconfig | 61 | ADD keyconfig /home/developer/keyconfig |
| 62 | ADD setupkolabnowtest.sh /home/developer/setupkolabnowtest.sh | 62 | ADD setupkolabnowtest.sh /home/developer/setupkolabnowtest.sh |
| 63 | RUN gpg2 --batch --generate-key /home/developer/keyconfig | 63 | RUN gpg2 --batch --generate-key /home/developer/keyconfig |
| 64 | RUN echo "pinentry-program /usr/bin/pinentry-gtk" > /home/developer/.gnupg/gpg-agent.conf | 64 | ADD gpg-agent.conf /home/developer/.gnupg/gpg-agent.conf |
| 65 | 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 @@ | |||
| 1 | utf8-strings | ||
| 2 | keyserver hkp://pgp.mit.edu | ||
| 3 | debug-level basic | ||