From 8f97d7ff0d2ec8e214c3169110e6b284ccf35154 Mon Sep 17 00:00:00 2001 From: J0WI Date: Tue, 5 Jun 2018 00:39:32 +0200 Subject: [PATCH] Adjust gpg code to kill daemons, cutting down on race conditions --- php-apache/Dockerfile | 6 +++--- php-fpm/Dockerfile | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/php-apache/Dockerfile b/php-apache/Dockerfile index 835bc76..99d7b0c 100644 --- 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 8eacce8..2fee04f 100644 --- 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