From 2714a3cc742f9ba0e1331853f2a162a8fa1e4753 Mon Sep 17 00:00:00 2001 From: J0WI Date: Tue, 5 Jun 2018 00:05:52 +0200 Subject: [PATCH 1/3] 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 73ed0909..9fb72d79 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 ae1553e9..d24eb5ba 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 ef7cddcb..a515b4e2 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 38c2f3c5..c49fa6ee 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 a929da50..133197bd 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 fdbc104c..cbf55a72 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 1b4cb624..ae703b35 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 83dc5d1d..9c20a22d 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 d058729b..d598e697 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 8f881b23..ee4c2786 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 2afe137e..38e91530 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 165da1f4..e6d162f2 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 6207d644..06127b35 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 eb21a29c..d728d94e 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; \ From 8ac2fb92d2af8ba5aacb2fe4e15c38e7e09a2cd2 Mon Sep 17 00:00:00 2001 From: Tilo Spannagel Date: Tue, 5 Jun 2018 00:11:45 +0200 Subject: [PATCH 2/3] Revert "Kill the gpg-agent" This reverts commit edada57b6ef380471a2ef81fdc1b487bd56c9c27. --- Dockerfile-alpine.template | 1 - Dockerfile-debian.template | 1 - 2 files changed, 2 deletions(-) diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 06127b35..6eabcf84 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -99,7 +99,6 @@ RUN set -ex; \ # gpg key from https://nextcloud.com/nextcloud.asc gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \ 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; \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index d728d94e..a11f62f1 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -112,7 +112,6 @@ RUN set -ex; \ # gpg key from https://nextcloud.com/nextcloud.asc gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \ 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; \ From b1aa2bdb40010743a4794bfa244c41f446555c98 Mon Sep 17 00:00:00 2001 From: Tilo Spannagel Date: Tue, 5 Jun 2018 00:12:52 +0200 Subject: [PATCH 3/3] Run update.sh Signed-off-by: Tilo Spannagel --- 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 - 12 files changed, 12 deletions(-) diff --git a/12.0-rc/apache/Dockerfile b/12.0-rc/apache/Dockerfile index 9fb72d79..43dedd29 100644 --- a/12.0-rc/apache/Dockerfile +++ b/12.0-rc/apache/Dockerfile @@ -121,7 +121,6 @@ RUN set -ex; \ # gpg key from https://nextcloud.com/nextcloud.asc gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \ 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; \ diff --git a/12.0-rc/fpm-alpine/Dockerfile b/12.0-rc/fpm-alpine/Dockerfile index d24eb5ba..d2679cc9 100644 --- a/12.0-rc/fpm-alpine/Dockerfile +++ b/12.0-rc/fpm-alpine/Dockerfile @@ -100,7 +100,6 @@ RUN set -ex; \ # gpg key from https://nextcloud.com/nextcloud.asc gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \ 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; \ diff --git a/12.0-rc/fpm/Dockerfile b/12.0-rc/fpm/Dockerfile index a515b4e2..90c1274c 100644 --- a/12.0-rc/fpm/Dockerfile +++ b/12.0-rc/fpm/Dockerfile @@ -113,7 +113,6 @@ RUN set -ex; \ # gpg key from https://nextcloud.com/nextcloud.asc gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \ 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; \ diff --git a/12.0/apache/Dockerfile b/12.0/apache/Dockerfile index c49fa6ee..c58d9466 100644 --- a/12.0/apache/Dockerfile +++ b/12.0/apache/Dockerfile @@ -121,7 +121,6 @@ RUN set -ex; \ # gpg key from https://nextcloud.com/nextcloud.asc gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \ 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; \ diff --git a/12.0/fpm-alpine/Dockerfile b/12.0/fpm-alpine/Dockerfile index 133197bd..2b904235 100644 --- a/12.0/fpm-alpine/Dockerfile +++ b/12.0/fpm-alpine/Dockerfile @@ -100,7 +100,6 @@ RUN set -ex; \ # gpg key from https://nextcloud.com/nextcloud.asc gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \ 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; \ diff --git a/12.0/fpm/Dockerfile b/12.0/fpm/Dockerfile index cbf55a72..4ea38267 100644 --- a/12.0/fpm/Dockerfile +++ b/12.0/fpm/Dockerfile @@ -113,7 +113,6 @@ RUN set -ex; \ # gpg key from https://nextcloud.com/nextcloud.asc gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \ 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; \ diff --git a/13.0-rc/apache/Dockerfile b/13.0-rc/apache/Dockerfile index ae703b35..df3c1999 100644 --- a/13.0-rc/apache/Dockerfile +++ b/13.0-rc/apache/Dockerfile @@ -121,7 +121,6 @@ RUN set -ex; \ # gpg key from https://nextcloud.com/nextcloud.asc gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \ 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; \ diff --git a/13.0-rc/fpm-alpine/Dockerfile b/13.0-rc/fpm-alpine/Dockerfile index 9c20a22d..7bf5f8e4 100644 --- a/13.0-rc/fpm-alpine/Dockerfile +++ b/13.0-rc/fpm-alpine/Dockerfile @@ -100,7 +100,6 @@ RUN set -ex; \ # gpg key from https://nextcloud.com/nextcloud.asc gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \ 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; \ diff --git a/13.0-rc/fpm/Dockerfile b/13.0-rc/fpm/Dockerfile index d598e697..88d3eeee 100644 --- a/13.0-rc/fpm/Dockerfile +++ b/13.0-rc/fpm/Dockerfile @@ -113,7 +113,6 @@ RUN set -ex; \ # gpg key from https://nextcloud.com/nextcloud.asc gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \ 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; \ diff --git a/13.0/apache/Dockerfile b/13.0/apache/Dockerfile index ee4c2786..64d3bfe3 100644 --- a/13.0/apache/Dockerfile +++ b/13.0/apache/Dockerfile @@ -121,7 +121,6 @@ RUN set -ex; \ # gpg key from https://nextcloud.com/nextcloud.asc gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \ 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; \ diff --git a/13.0/fpm-alpine/Dockerfile b/13.0/fpm-alpine/Dockerfile index 38e91530..fd04c20a 100644 --- a/13.0/fpm-alpine/Dockerfile +++ b/13.0/fpm-alpine/Dockerfile @@ -100,7 +100,6 @@ RUN set -ex; \ # gpg key from https://nextcloud.com/nextcloud.asc gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \ 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; \ diff --git a/13.0/fpm/Dockerfile b/13.0/fpm/Dockerfile index e6d162f2..ccde8c8d 100644 --- a/13.0/fpm/Dockerfile +++ b/13.0/fpm/Dockerfile @@ -113,7 +113,6 @@ RUN set -ex; \ # gpg key from https://nextcloud.com/nextcloud.asc gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \ 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; \