Adjust gpg code to kill daemons, cutting down on race conditions

diff --git a/php-apache/Dockerfile b/php-apache/Dockerfile
index 835bc769fbad33a1e53445ede62ae06a3c050956..99d7b0c4690a9f8f102df50da1546813c66176e6 100644 (file)
--- a/php-apache/Dockerfile
+++ b/php-apache/Dockerfile
@@ -66,12 +66,12 @@ RUN set -ex; \
        export GNUPGHOME="$(mktemp -d)"; \
        gpg --keyserver ha.pool.sks-keyservers.net --recv-keys F3E4C04BB3DB5D4215C45F7F5AB2BAA141C4F7D5; \
        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/; \
+       gpgconf --kill all; \
+       rm -r "$GNUPGHOME" roundcubemail.tar.gz.asc roundcubemail.tar.gz; \
        # 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
+       rm -rf /usr/src/roundcubemail/installer
 
 # include the wait-for-it.sh script
 RUN curl https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh > /wait-for-it.sh && chmod +x /wait-for-it.sh

diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
index 8eacce8d72cfa98c0e6a3da4f2e7766645591466..2fee04f2ecf8bc20bf11831b75c92ce1d7916f4b 100644 (file)
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@@ -63,12 +63,12 @@ RUN set -ex; \
        export GNUPGHOME="$(mktemp -d)"; \
        gpg --keyserver ha.pool.sks-keyservers.net --recv-keys F3E4C04BB3DB5D4215C45F7F5AB2BAA141C4F7D5; \
        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/; \
+       gpgconf --kill all; \
+       rm -r "$GNUPGHOME" roundcubemail.tar.gz.asc roundcubemail.tar.gz; \
        # 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
+       rm -rf /usr/src/roundcubemail/installer
 
 # include the wait-for-it.sh script
 RUN curl https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh > /wait-for-it.sh && chmod +x /wait-for-it.sh