From edada57b6ef380471a2ef81fdc1b487bd56c9c27 Mon Sep 17 00:00:00 2001 From: Tilo Spannagel Date: Mon, 4 Jun 2018 22:58:34 +0200 Subject: [PATCH 1/2] Kill the gpg-agent Signed-off-by: Tilo Spannagel --- Dockerfile-alpine.template | 1 + Dockerfile-debian.template | 1 + 2 files changed, 2 insertions(+) diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index f048696..6207d64 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -99,6 +99,7 @@ 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/; \ rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \ rm -rf /usr/src/nextcloud/updater; \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index ff0785b..eb21a29 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -112,6 +112,7 @@ 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/; \ rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \ rm -rf /usr/src/nextcloud/updater; \ From 54fd1cc8ec88ada5ebcb929a4c2ce197fa2e04ac Mon Sep 17 00:00:00 2001 From: Tilo Spannagel Date: Mon, 4 Jun 2018 23:08:37 +0200 Subject: [PATCH 2/2] 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 insertions(+) diff --git a/12.0-rc/apache/Dockerfile b/12.0-rc/apache/Dockerfile index 78cd3f1..73ed090 100644 --- a/12.0-rc/apache/Dockerfile +++ b/12.0-rc/apache/Dockerfile @@ -121,6 +121,7 @@ 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/; \ rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \ rm -rf /usr/src/nextcloud/updater; \ diff --git a/12.0-rc/fpm-alpine/Dockerfile b/12.0-rc/fpm-alpine/Dockerfile index 8a44e8f..ae1553e 100644 --- a/12.0-rc/fpm-alpine/Dockerfile +++ b/12.0-rc/fpm-alpine/Dockerfile @@ -100,6 +100,7 @@ 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/; \ rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \ rm -rf /usr/src/nextcloud/updater; \ diff --git a/12.0-rc/fpm/Dockerfile b/12.0-rc/fpm/Dockerfile index de2f31e..ef7cddc 100644 --- a/12.0-rc/fpm/Dockerfile +++ b/12.0-rc/fpm/Dockerfile @@ -113,6 +113,7 @@ 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/; \ rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \ rm -rf /usr/src/nextcloud/updater; \ diff --git a/12.0/apache/Dockerfile b/12.0/apache/Dockerfile index bdaf1cc..38c2f3c 100644 --- a/12.0/apache/Dockerfile +++ b/12.0/apache/Dockerfile @@ -121,6 +121,7 @@ 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/; \ rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \ rm -rf /usr/src/nextcloud/updater; \ diff --git a/12.0/fpm-alpine/Dockerfile b/12.0/fpm-alpine/Dockerfile index 24ca214..a929da5 100644 --- a/12.0/fpm-alpine/Dockerfile +++ b/12.0/fpm-alpine/Dockerfile @@ -100,6 +100,7 @@ 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/; \ rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \ rm -rf /usr/src/nextcloud/updater; \ diff --git a/12.0/fpm/Dockerfile b/12.0/fpm/Dockerfile index 486f656..fdbc104 100644 --- a/12.0/fpm/Dockerfile +++ b/12.0/fpm/Dockerfile @@ -113,6 +113,7 @@ 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/; \ rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \ rm -rf /usr/src/nextcloud/updater; \ diff --git a/13.0-rc/apache/Dockerfile b/13.0-rc/apache/Dockerfile index 38e9e03..1b4cb62 100644 --- a/13.0-rc/apache/Dockerfile +++ b/13.0-rc/apache/Dockerfile @@ -121,6 +121,7 @@ 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/; \ rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \ rm -rf /usr/src/nextcloud/updater; \ diff --git a/13.0-rc/fpm-alpine/Dockerfile b/13.0-rc/fpm-alpine/Dockerfile index 8bc75f1..83dc5d1 100644 --- a/13.0-rc/fpm-alpine/Dockerfile +++ b/13.0-rc/fpm-alpine/Dockerfile @@ -100,6 +100,7 @@ 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/; \ rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \ rm -rf /usr/src/nextcloud/updater; \ diff --git a/13.0-rc/fpm/Dockerfile b/13.0-rc/fpm/Dockerfile index a57e597..d058729 100644 --- a/13.0-rc/fpm/Dockerfile +++ b/13.0-rc/fpm/Dockerfile @@ -113,6 +113,7 @@ 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/; \ rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \ rm -rf /usr/src/nextcloud/updater; \ diff --git a/13.0/apache/Dockerfile b/13.0/apache/Dockerfile index fd71061..8f881b2 100644 --- a/13.0/apache/Dockerfile +++ b/13.0/apache/Dockerfile @@ -121,6 +121,7 @@ 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/; \ rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \ rm -rf /usr/src/nextcloud/updater; \ diff --git a/13.0/fpm-alpine/Dockerfile b/13.0/fpm-alpine/Dockerfile index a0765c8..2afe137 100644 --- a/13.0/fpm-alpine/Dockerfile +++ b/13.0/fpm-alpine/Dockerfile @@ -100,6 +100,7 @@ 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/; \ rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \ rm -rf /usr/src/nextcloud/updater; \ diff --git a/13.0/fpm/Dockerfile b/13.0/fpm/Dockerfile index eca7f70..165da1f 100644 --- a/13.0/fpm/Dockerfile +++ b/13.0/fpm/Dockerfile @@ -113,6 +113,7 @@ 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/; \ rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \ rm -rf /usr/src/nextcloud/updater; \