From 2ba09915336aa1baaccdc5bfcb1dead9b3471514 Mon Sep 17 00:00:00 2001 From: Tilo Spannagel Date: Thu, 24 May 2018 21:19:01 +0200 Subject: [PATCH 1/2] Fix a race condition caused by the gpg-agent Signed-off-by: Tilo Spannagel --- Dockerfile-alpine.template | 3 +-- Dockerfile-debian.template | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index c5ddca59..05cfc01b 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -98,9 +98,8 @@ 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; \ - rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc; \ tar -xjf nextcloud.tar.bz2 -C /usr/src/; \ - rm nextcloud.tar.bz2; \ + rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \ rm -rf /usr/src/nextcloud/updater; \ mkdir -p /usr/src/nextcloud/data; \ mkdir -p /usr/src/nextcloud/custom_apps; \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 7a045f59..b2e2c7c1 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -111,9 +111,8 @@ 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; \ - rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc; \ tar -xjf nextcloud.tar.bz2 -C /usr/src/; \ - rm nextcloud.tar.bz2; \ + rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \ rm -rf /usr/src/nextcloud/updater; \ mkdir -p /usr/src/nextcloud/data; \ mkdir -p /usr/src/nextcloud/custom_apps; \ From 5af0fda705c16db8b424c4b768cdc6b5b3690b85 Mon Sep 17 00:00:00 2001 From: Tilo Spannagel Date: Thu, 24 May 2018 21:20:13 +0200 Subject: [PATCH 2/2] Run update.sh Signed-off-by: Tilo Spannagel --- 12.0/apache/Dockerfile | 3 +-- 12.0/fpm-alpine/Dockerfile | 3 +-- 12.0/fpm/Dockerfile | 3 +-- 13.0/apache/Dockerfile | 3 +-- 13.0/fpm-alpine/Dockerfile | 3 +-- 13.0/fpm/Dockerfile | 3 +-- 6 files changed, 6 insertions(+), 12 deletions(-) diff --git a/12.0/apache/Dockerfile b/12.0/apache/Dockerfile index f1aae06e..e9e059d7 100644 --- a/12.0/apache/Dockerfile +++ b/12.0/apache/Dockerfile @@ -120,9 +120,8 @@ 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; \ - rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc; \ tar -xjf nextcloud.tar.bz2 -C /usr/src/; \ - rm nextcloud.tar.bz2; \ + rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \ rm -rf /usr/src/nextcloud/updater; \ mkdir -p /usr/src/nextcloud/data; \ mkdir -p /usr/src/nextcloud/custom_apps; \ diff --git a/12.0/fpm-alpine/Dockerfile b/12.0/fpm-alpine/Dockerfile index 6040e83d..c75b3369 100644 --- a/12.0/fpm-alpine/Dockerfile +++ b/12.0/fpm-alpine/Dockerfile @@ -99,9 +99,8 @@ 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; \ - rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc; \ tar -xjf nextcloud.tar.bz2 -C /usr/src/; \ - rm nextcloud.tar.bz2; \ + rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \ rm -rf /usr/src/nextcloud/updater; \ mkdir -p /usr/src/nextcloud/data; \ mkdir -p /usr/src/nextcloud/custom_apps; \ diff --git a/12.0/fpm/Dockerfile b/12.0/fpm/Dockerfile index 3b1dafb2..019b6645 100644 --- a/12.0/fpm/Dockerfile +++ b/12.0/fpm/Dockerfile @@ -112,9 +112,8 @@ 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; \ - rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc; \ tar -xjf nextcloud.tar.bz2 -C /usr/src/; \ - rm nextcloud.tar.bz2; \ + rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \ rm -rf /usr/src/nextcloud/updater; \ mkdir -p /usr/src/nextcloud/data; \ mkdir -p /usr/src/nextcloud/custom_apps; \ diff --git a/13.0/apache/Dockerfile b/13.0/apache/Dockerfile index fedc3765..8f173530 100644 --- a/13.0/apache/Dockerfile +++ b/13.0/apache/Dockerfile @@ -120,9 +120,8 @@ 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; \ - rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc; \ tar -xjf nextcloud.tar.bz2 -C /usr/src/; \ - rm nextcloud.tar.bz2; \ + rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \ rm -rf /usr/src/nextcloud/updater; \ mkdir -p /usr/src/nextcloud/data; \ mkdir -p /usr/src/nextcloud/custom_apps; \ diff --git a/13.0/fpm-alpine/Dockerfile b/13.0/fpm-alpine/Dockerfile index 47a6784f..2b753276 100644 --- a/13.0/fpm-alpine/Dockerfile +++ b/13.0/fpm-alpine/Dockerfile @@ -99,9 +99,8 @@ 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; \ - rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc; \ tar -xjf nextcloud.tar.bz2 -C /usr/src/; \ - rm nextcloud.tar.bz2; \ + rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \ rm -rf /usr/src/nextcloud/updater; \ mkdir -p /usr/src/nextcloud/data; \ mkdir -p /usr/src/nextcloud/custom_apps; \ diff --git a/13.0/fpm/Dockerfile b/13.0/fpm/Dockerfile index 1921c634..26a67825 100644 --- a/13.0/fpm/Dockerfile +++ b/13.0/fpm/Dockerfile @@ -112,9 +112,8 @@ 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; \ - rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc; \ tar -xjf nextcloud.tar.bz2 -C /usr/src/; \ - rm nextcloud.tar.bz2; \ + rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \ rm -rf /usr/src/nextcloud/updater; \ mkdir -p /usr/src/nextcloud/data; \ mkdir -p /usr/src/nextcloud/custom_apps; \