mauro/docker-image-roundcube
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add gnupg dependency (#16)

Browse Source 
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.
This commit is contained in:
Thomas Bruederli 2018-06-04 23:13:51 +02:00
parent 4aa970ba4d
commit a194c2cfad
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
php-apache/Dockerfile
View File

@ -58,6 +58,9 @@ ENV ROUNDCUBEMAIL_VERSION 1.3.6
# Download package and extract to web volume # Download package and extract to web volume
RUN set -ex; \ 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 -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; \ 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)"; \ export GNUPGHOME="$(mktemp -d)"; \
@ -65,7 +68,7 @@ RUN set -ex; \
gpg --batch --verify roundcubemail.tar.gz.asc roundcubemail.tar.gz; \ gpg --batch --verify roundcubemail.tar.gz.asc roundcubemail.tar.gz; \
rm -r "$GNUPGHOME" roundcubemail.tar.gz.asc; \ rm -r "$GNUPGHOME" roundcubemail.tar.gz.asc; \
tar -xzf roundcubemail.tar.gz -C /usr/src/; \ 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; \ mv /usr/src/roundcubemail-${ROUNDCUBEMAIL_VERSION} /usr/src/roundcubemail; \
rm -rf /usr/src/roundcubemail/installer; \ rm -rf /usr/src/roundcubemail/installer; \
rm roundcubemail.tar.gz rm roundcubemail.tar.gz

5
php-fpm/Dockerfile
View File

@ -55,6 +55,9 @@ ENV ROUNDCUBEMAIL_VERSION 1.3.6
# Download package and extract to web volume # Download package and extract to web volume
RUN set -ex; \ 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 -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; \ 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)"; \ export GNUPGHOME="$(mktemp -d)"; \
@ -62,7 +65,7 @@ RUN set -ex; \
gpg --batch --verify roundcubemail.tar.gz.asc roundcubemail.tar.gz; \ gpg --batch --verify roundcubemail.tar.gz.asc roundcubemail.tar.gz; \
rm -r "$GNUPGHOME" roundcubemail.tar.gz.asc; \ rm -r "$GNUPGHOME" roundcubemail.tar.gz.asc; \
tar -xzf roundcubemail.tar.gz -C /usr/src/; \ 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; \ mv /usr/src/roundcubemail-${ROUNDCUBEMAIL_VERSION} /usr/src/roundcubemail; \
rm -rf /usr/src/roundcubemail/installer; \ rm -rf /usr/src/roundcubemail/installer; \
rm roundcubemail.tar.gz rm roundcubemail.tar.gz