diff options
author | Lauri Ojansivu <x@xet7.org> | 2018-01-28 11:22:00 +0200 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2018-01-28 11:22:00 +0200 |
commit | 0ce4171d33dcdfb81057a8b037ee893bedd14cf0 (patch) | |
tree | 488a05b4433984966d64c59ef039ad5e920b1a99 | |
parent | 081c1fdf835c6f1d2030b3b9e23229378d4f8cce (diff) | |
parent | 7df5679c0cf847e40db74ad3cb471b7466e7eb6c (diff) | |
download | wekan-0ce4171d33dcdfb81057a8b037ee893bedd14cf0.tar.gz wekan-0ce4171d33dcdfb81057a8b037ee893bedd14cf0.tar.bz2 wekan-0ce4171d33dcdfb81057a8b037ee893bedd14cf0.zip |
Merge branch 'soohwa-fix-dockerfile-rm' into devel
Fix Dockerfile for Debian. Thanks to soohwa !
-rw-r--r-- | CHANGELOG.md | 8 | ||||
-rw-r--r-- | Dockerfile | 7 |
2 files changed, 13 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 24a188cc..8627e327 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: @@ -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 && \ |