summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ0WI <J0WI@users.noreply.github.com>2018-06-05 00:05:52 +0200
committerJ0WI <J0WI@users.noreply.github.com>2018-06-05 00:05:52 +0200
commit2714a3cc742f9ba0e1331853f2a162a8fa1e4753 (patch)
tree53376b0dc5a27245dc8291b59c5a7211150348b6
parentf42c63ea485eb6829e3d1a7658653ae63f22da45 (diff)
Adjust gpg code to kill daemons, cutting down on race conditions
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 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; \
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-04 12:07:10 +0000