From 2714a3cc742f9ba0e1331853f2a162a8fa1e4753 Mon Sep 17 00:00:00 2001 From: J0WI Date: Tue, 5 Jun 2018 00:05:52 +0200 Subject: [PATCH] Adjust gpg code to kill daemons, cutting down on race conditions --- 12.0-rc/apache/Dockerfile | 1 + 12.0-rc/fpm-alpine/Dockerfile | 1 + 12.0-rc/fpm/Dockerfile | 1 + 12.0/apache/Dockerfile | 1 + 12.0/fpm-alpine/Dockerfile | 1 + 12.0/fpm/Dockerfile | 1 + 13.0-rc/apache/Dockerfile | 1 + 13.0-rc/fpm-alpine/Dockerfile | 1 + 13.0-rc/fpm/Dockerfile | 1 + 13.0/apache/Dockerfile | 1 + 13.0/fpm-alpine/Dockerfile | 1 + 13.0/fpm/Dockerfile | 1 + Dockerfile-alpine.template | 1 + Dockerfile-debian.template | 1 + 14 files changed, 14 insertions(+) diff --git a/12.0-rc/apache/Dockerfile b/12.0-rc/apache/Dockerfile index 73ed090..9fb72d7 100644 --- a/12.0-rc/apache/Dockerfile +++ b/12.0-rc/apache/Dockerfile @@ -123,6 +123,7 @@ RUN set -ex; \ gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \ busybox killall gpg-agent || true; \ tar -xjf nextcloud.tar.bz2 -C /usr/src/; \ + gpgconf --kill all; \ rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \ rm -rf /usr/src/nextcloud/updater; \ mkdir -p /usr/src/nextcloud/data; \ diff --git a/12.0-rc/fpm-alpine/Dockerfile b/12.0-rc/fpm-alpine/Dockerfile index ae1553e..d24eb5b 100644 --- a/12.0-rc/fpm-alpine/Dockerfile +++ b/12.0-rc/fpm-alpine/Dockerfile @@ -102,6 +102,7 @@ RUN set -ex; \ gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \ busybox killall gpg-agent || true; \ tar -xjf nextcloud.tar.bz2 -C /usr/src/; \ + gpgconf --kill all; \ rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \ rm -rf /usr/src/nextcloud/updater; \ mkdir -p /usr/src/nextcloud/data; \ diff --git a/12.0-rc/fpm/Dockerfile b/12.0-rc/fpm/Dockerfile index ef7cddc..a515b4e 100644 --- a/12.0-rc/fpm/Dockerfile +++ b/12.0-rc/fpm/Dockerfile @@ -115,6 +115,7 @@ RUN set -ex; \ gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \ busybox killall gpg-agent || true; \ tar -xjf nextcloud.tar.bz2 -C /usr/src/; \ + gpgconf --kill all; \ rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \ rm -rf /usr/src/nextcloud/updater; \ mkdir -p /usr/src/nextcloud/data; \ diff --git a/12.0/apache/Dockerfile b/12.0/apache/Dockerfile index 38c2f3c..c49fa6e 100644 --- a/12.0/apache/Dockerfile +++ b/12.0/apache/Dockerfile @@ -123,6 +123,7 @@ RUN set -ex; \ gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \ busybox killall gpg-agent || true; \ tar -xjf nextcloud.tar.bz2 -C /usr/src/; \ + gpgconf --kill all; \ rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \ rm -rf /usr/src/nextcloud/updater; \ mkdir -p /usr/src/nextcloud/data; \ diff --git a/12.0/fpm-alpine/Dockerfile b/12.0/fpm-alpine/Dockerfile index a929da5..133197b 100644 --- a/12.0/fpm-alpine/Dockerfile +++ b/12.0/fpm-alpine/Dockerfile @@ -102,6 +102,7 @@ RUN set -ex; \ gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \ busybox killall gpg-agent || true; \ tar -xjf nextcloud.tar.bz2 -C /usr/src/; \ + gpgconf --kill all; \ rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \ rm -rf /usr/src/nextcloud/updater; \ mkdir -p /usr/src/nextcloud/data; \ diff --git a/12.0/fpm/Dockerfile b/12.0/fpm/Dockerfile index fdbc104..cbf55a7 100644 --- a/12.0/fpm/Dockerfile +++ b/12.0/fpm/Dockerfile @@ -115,6 +115,7 @@ RUN set -ex; \ gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \ busybox killall gpg-agent || true; \ tar -xjf nextcloud.tar.bz2 -C /usr/src/; \ + gpgconf --kill all; \ rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \ rm -rf /usr/src/nextcloud/updater; \ mkdir -p /usr/src/nextcloud/data; \ diff --git a/13.0-rc/apache/Dockerfile b/13.0-rc/apache/Dockerfile index 1b4cb62..ae703b3 100644 --- a/13.0-rc/apache/Dockerfile +++ b/13.0-rc/apache/Dockerfile @@ -123,6 +123,7 @@ RUN set -ex; \ gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \ busybox killall gpg-agent || true; \ tar -xjf nextcloud.tar.bz2 -C /usr/src/; \ + gpgconf --kill all; \ rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \ rm -rf /usr/src/nextcloud/updater; \ mkdir -p /usr/src/nextcloud/data; \ diff --git a/13.0-rc/fpm-alpine/Dockerfile b/13.0-rc/fpm-alpine/Dockerfile index 83dc5d1..9c20a22 100644 --- a/13.0-rc/fpm-alpine/Dockerfile +++ b/13.0-rc/fpm-alpine/Dockerfile @@ -102,6 +102,7 @@ RUN set -ex; \ gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \ busybox killall gpg-agent || true; \ tar -xjf nextcloud.tar.bz2 -C /usr/src/; \ + gpgconf --kill all; \ rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \ rm -rf /usr/src/nextcloud/updater; \ mkdir -p /usr/src/nextcloud/data; \ diff --git a/13.0-rc/fpm/Dockerfile b/13.0-rc/fpm/Dockerfile index d058729..d598e69 100644 --- a/13.0-rc/fpm/Dockerfile +++ b/13.0-rc/fpm/Dockerfile @@ -115,6 +115,7 @@ RUN set -ex; \ gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \ busybox killall gpg-agent || true; \ tar -xjf nextcloud.tar.bz2 -C /usr/src/; \ + gpgconf --kill all; \ rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \ rm -rf /usr/src/nextcloud/updater; \ mkdir -p /usr/src/nextcloud/data; \ diff --git a/13.0/apache/Dockerfile b/13.0/apache/Dockerfile index 8f881b2..ee4c278 100644 --- a/13.0/apache/Dockerfile +++ b/13.0/apache/Dockerfile @@ -123,6 +123,7 @@ RUN set -ex; \ gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \ busybox killall gpg-agent || true; \ tar -xjf nextcloud.tar.bz2 -C /usr/src/; \ + gpgconf --kill all; \ rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \ rm -rf /usr/src/nextcloud/updater; \ mkdir -p /usr/src/nextcloud/data; \ diff --git a/13.0/fpm-alpine/Dockerfile b/13.0/fpm-alpine/Dockerfile index 2afe137..38e9153 100644 --- a/13.0/fpm-alpine/Dockerfile +++ b/13.0/fpm-alpine/Dockerfile @@ -102,6 +102,7 @@ RUN set -ex; \ gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \ busybox killall gpg-agent || true; \ tar -xjf nextcloud.tar.bz2 -C /usr/src/; \ + gpgconf --kill all; \ rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \ rm -rf /usr/src/nextcloud/updater; \ mkdir -p /usr/src/nextcloud/data; \ diff --git a/13.0/fpm/Dockerfile b/13.0/fpm/Dockerfile index 165da1f..e6d162f 100644 --- a/13.0/fpm/Dockerfile +++ b/13.0/fpm/Dockerfile @@ -115,6 +115,7 @@ RUN set -ex; \ gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \ busybox killall gpg-agent || true; \ tar -xjf nextcloud.tar.bz2 -C /usr/src/; \ + gpgconf --kill all; \ rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \ rm -rf /usr/src/nextcloud/updater; \ mkdir -p /usr/src/nextcloud/data; \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 6207d64..06127b3 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -101,6 +101,7 @@ RUN set -ex; \ gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \ busybox killall gpg-agent || true; \ tar -xjf nextcloud.tar.bz2 -C /usr/src/; \ + gpgconf --kill all; \ rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \ rm -rf /usr/src/nextcloud/updater; \ mkdir -p /usr/src/nextcloud/data; \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index eb21a29..d728d94 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -114,6 +114,7 @@ RUN set -ex; \ gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \ busybox killall gpg-agent || true; \ tar -xjf nextcloud.tar.bz2 -C /usr/src/; \ + gpgconf --kill all; \ rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \ rm -rf /usr/src/nextcloud/updater; \ mkdir -p /usr/src/nextcloud/data; \