summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTilo Spannagel <development@tilosp.de>2018-06-04 23:46:14 +0200
committerGitHub <noreply@github.com>2018-06-04 23:46:14 +0200
commitf42c63ea485eb6829e3d1a7658653ae63f22da45 (patch)
tree6de8a7f4a389b97116fba1debbe55fa54278f1c9
parent5ea40f130fba02b2ac088ec57b6fc6959478448a (diff)
parent54fd1cc8ec88ada5ebcb929a4c2ce197fa2e04ac (diff)
Merge pull request #357 from nextcloud/kill-gpg-agent
Kill the gpg-agent
Diffstat
-rw-r--r--12.0-rc/apache/Dockerfile1
-rw-r--r--12.0-rc/fpm-alpine/Dockerfile1
-rw-r--r--12.0-rc/fpm/Dockerfile1
-rw-r--r--12.0/apache/Dockerfile1
-rw-r--r--12.0/fpm-alpine/Dockerfile1
-rw-r--r--12.0/fpm/Dockerfile1
-rw-r--r--13.0-rc/apache/Dockerfile1
-rw-r--r--13.0-rc/fpm-alpine/Dockerfile1
-rw-r--r--13.0-rc/fpm/Dockerfile1
-rw-r--r--13.0/apache/Dockerfile1
-rw-r--r--13.0/fpm-alpine/Dockerfile1
-rw-r--r--13.0/fpm/Dockerfile1
-rw-r--r--Dockerfile-alpine.template1
-rw-r--r--Dockerfile-debian.template1
14 files changed, 14 insertions, 0 deletions
diff --git a/12.0-rc/apache/Dockerfile b/12.0-rc/apache/Dockerfile
index 78cd3f16..73ed0909 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 8a44e8fd..ae1553e9 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 de2f31ee..ef7cddcb 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 bdaf1cc6..38c2f3c5 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 24ca2140..a929da50 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 486f6564..fdbc104c 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 38e9e032..1b4cb624 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 8bc75f1a..83dc5d1d 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 a57e5971..d058729b 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 fd710615..8f881b23 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 a0765c87..2afe137e 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 eca7f70d..165da1f4 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; \
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
index f048696b..6207d644 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 ff0785b3..eb21a29c 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; \
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-04 13:55:30 +0000