From 2ba09915336aa1baaccdc5bfcb1dead9b3471514 Mon Sep 17 00:00:00 2001 From: Tilo Spannagel Date: Thu, 24 May 2018 21:19:01 +0200 Subject: [PATCH] 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 c5ddca5..05cfc01 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 7a045f5..b2e2c7c 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; \