From a194c2cfad2f539215a0240b4ca6dca5ace8d6af Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Mon, 4 Jun 2018 23:13:51 +0200
Subject: [PATCH] Add gnupg dependency (#16)

Apparently GnuPG has been removed from newer base images.
This re-adds it ad keep it installed to enable the use of the Enigma plugin.
---
 php-apache/Dockerfile | 5 ++++-
 php-fpm/Dockerfile    | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/php-apache/Dockerfile b/php-apache/Dockerfile
index 486bd76..835bc76 100644
--- a/php-apache/Dockerfile
+++ b/php-apache/Dockerfile
@@ -58,6 +58,9 @@ ENV ROUNDCUBEMAIL_VERSION 1.3.6
 
 # Download package and extract to web volume
 RUN set -ex; \
+	fetchDeps="gnupg dirmngr"; \
+	apt-get -qq update; \
+	apt-get install -y --no-install-recommends $fetchDeps; \
 	curl -o roundcubemail.tar.gz -SL https://github.com/roundcube/roundcubemail/releases/download/${ROUNDCUBEMAIL_VERSION}/roundcubemail-${ROUNDCUBEMAIL_VERSION}-complete.tar.gz; \
 	curl -o roundcubemail.tar.gz.asc -SL https://github.com/roundcube/roundcubemail/releases/download/${ROUNDCUBEMAIL_VERSION}/roundcubemail-${ROUNDCUBEMAIL_VERSION}-complete.tar.gz.asc; \
 	export GNUPGHOME="$(mktemp -d)"; \
@@ -65,7 +68,7 @@ RUN set -ex; \
 	gpg --batch --verify roundcubemail.tar.gz.asc roundcubemail.tar.gz; \
 	rm -r "$GNUPGHOME" roundcubemail.tar.gz.asc; \
 	tar -xzf roundcubemail.tar.gz -C /usr/src/; \
-# upstream tarballs include ./roundcubemail-${ROUNDCUBEMAIL_VERSION}/ so this gives us /usr/src/roundcubemail-${ROUNDCUBEMAIL_VERSION}
+	# upstream tarballs include ./roundcubemail-${ROUNDCUBEMAIL_VERSION}/ so this gives us /usr/src/roundcubemail-${ROUNDCUBEMAIL_VERSION}
 	mv /usr/src/roundcubemail-${ROUNDCUBEMAIL_VERSION} /usr/src/roundcubemail; \
 	rm -rf /usr/src/roundcubemail/installer; \
 	rm roundcubemail.tar.gz
diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
index 4868b9f..8eacce8 100644
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@@ -55,6 +55,9 @@ ENV ROUNDCUBEMAIL_VERSION 1.3.6
 
 # Download package and extract to web volume
 RUN set -ex; \
+	fetchDeps="gnupg dirmngr"; \
+	apt-get -qq update; \
+	apt-get install -y --no-install-recommends $fetchDeps; \
 	curl -o roundcubemail.tar.gz -SL https://github.com/roundcube/roundcubemail/releases/download/${ROUNDCUBEMAIL_VERSION}/roundcubemail-${ROUNDCUBEMAIL_VERSION}-complete.tar.gz; \
 	curl -o roundcubemail.tar.gz.asc -SL https://github.com/roundcube/roundcubemail/releases/download/${ROUNDCUBEMAIL_VERSION}/roundcubemail-${ROUNDCUBEMAIL_VERSION}-complete.tar.gz.asc; \
 	export GNUPGHOME="$(mktemp -d)"; \
@@ -62,7 +65,7 @@ RUN set -ex; \
 	gpg --batch --verify roundcubemail.tar.gz.asc roundcubemail.tar.gz; \
 	rm -r "$GNUPGHOME" roundcubemail.tar.gz.asc; \
 	tar -xzf roundcubemail.tar.gz -C /usr/src/; \
-# upstream tarballs include ./roundcubemail-${ROUNDCUBEMAIL_VERSION}/ so this gives us /usr/src/roundcubemail-${ROUNDCUBEMAIL_VERSION}
+	# upstream tarballs include ./roundcubemail-${ROUNDCUBEMAIL_VERSION}/ so this gives us /usr/src/roundcubemail-${ROUNDCUBEMAIL_VERSION}
 	mv /usr/src/roundcubemail-${ROUNDCUBEMAIL_VERSION} /usr/src/roundcubemail; \
 	rm -rf /usr/src/roundcubemail/installer; \
 	rm roundcubemail.tar.gz