From 1616dd1b74dad1d39fbc82626fe71c7d4677352a Mon Sep 17 00:00:00 2001 From: soohwa Date: Sun, 28 Jan 2018 10:04:10 +0100 Subject: [PATCH 1/2] Fix Dockerfile --- Dockerfile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index a99391b61..cb323ab0e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -40,7 +40,7 @@ RUN \ # Verify nodejs authenticity grep ${NODE_VERSION}-${ARCHITECTURE}.tar.gz SHASUMS256.txt.asc | shasum -a 256 -c - && \ export GNUPGHOME="$(mktemp -d)" && \ - + \ # Try other key servers if ha.pool.sks-keyservers.net is unreachable # Code from https://github.com/chorrell/docker-node/commit/2b673e17547c34f17f24553db02beefbac98d23c # gpg keys listed at https://github.com/nodejs/node#release-team @@ -59,7 +59,10 @@ RUN \ gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \ done && \ gpg --verify SHASUMS256.txt.asc && \ - rm -R "$GNUPGHOME" SHASUMS256.txt.asc && \ + # Ignore socket files then delete files then delete directories + find "$GNUPGHOME" -type f | xargs rm -f && \ + find "$GNUPGHOME" -type d | xargs rm -fR && \ + rm -f SHASUMS256.txt.asc && \ \ # Install Node tar xvzf node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz && \ From 7df5679c0cf847e40db74ad3cb471b7466e7eb6c Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sun, 28 Jan 2018 11:21:21 +0200 Subject: [PATCH 2/2] Fix Dockerfile for Debian. Thanks to soohwa ! --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 24a188cc6..8627e327d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +# Upcoming Wekan release + +This release fixes the following bugs: + +* [Fix Dockerfile for Debian](https://github.com/wekan/wekan/pull/1439). + +Thanks to GitHub user soohwa for contributions. + # v0.65 2018-01-28 Wekan release This release adds the following new features: