summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2018-01-28 18:27:57 +0200
committerLauri Ojansivu <x@xet7.org>2018-01-28 18:27:57 +0200
commitcf9712351205ce14bd9973c82d11e9beec7e05c2 (patch)
tree7682f394f7f2561b73b1700e2c7c5ed2ef5f94ae
parent6aca70f0d11cd93355f65356c5550e7071f42aaa (diff)
parentfd430d3405ff4da6659393065909fa44f67312af (diff)
downloadwekan-cf9712351205ce14bd9973c82d11e9beec7e05c2.tar.gz
wekan-cf9712351205ce14bd9973c82d11e9beec7e05c2.tar.bz2
wekan-cf9712351205ce14bd9973c82d11e9beec7e05c2.zip
Merge branch 'devel'
-rw-r--r--CHANGELOG.md8
-rw-r--r--Dockerfile7
-rw-r--r--package.json2
-rw-r--r--sandstorm-pkgdef.capnp4
4 files changed, 16 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 24a188cc..44778896 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# v0.66 2018-01-28 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:
diff --git a/Dockerfile b/Dockerfile
index a99391b6..cb323ab0 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 && \
diff --git a/package.json b/package.json
index e845460f..04da58a7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "wekan",
- "version": "0.65.0",
+ "version": "0.66.0",
"description": "The open-source Trello-like kanban",
"private": true,
"scripts": {
diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp
index 7b67974a..8fd5106d 100644
--- a/sandstorm-pkgdef.capnp
+++ b/sandstorm-pkgdef.capnp
@@ -22,10 +22,10 @@ const pkgdef :Spk.PackageDefinition = (
appTitle = (defaultText = "Wekan"),
# The name of the app as it is displayed to the user.
- appVersion = 50,
+ appVersion = 51,
# Increment this for every release.
- appMarketingVersion = (defaultText = "0.65.0~2018-01-28"),
+ appMarketingVersion = (defaultText = "0.66.0~2018-01-28"),
# Human-readable presentation of the app version.
minUpgradableAppVersion = 0,