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.

diff --git a/php-apache/Dockerfile b/php-apache/Dockerfile
index 486bd760b50979d6a4cb2b255aa06d81032ae3a7..835bc769fbad33a1e53445ede62ae06a3c050956 100644 (file)
--- 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 4868b9f956fa44c7c3713ac75912fe3a3e4d55c2..8eacce8d72cfa98c0e6a3da4f2e7766645591466 100644 (file)
--- 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