From c7e02ad2ee4a6aa85d23979d291bd8bf10b61ab4 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Tue, 14 Aug 2018 17:09:46 +0300 Subject: [PATCH 1/6] Fix trusted url on docker-compose.yml. --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 9e96bcf10..e7c1cbea9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -54,7 +54,7 @@ services: # and allows all iframing etc. See wekan/server/policy.js - BROWSER_POLICY_ENABLED=true # When browser policy is enabled, HTML code at this Trusted URL can have iframe that embeds Wekan inside. - - TRUSTED_URL= + - TRUSTED_URL='' depends_on: - wekandb From 94079923128235ffcf15be30acddeb2d3e37063e Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Tue, 14 Aug 2018 17:29:53 +0300 Subject: [PATCH 2/6] Fix typo. --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index e7c1cbea9..c46b3e3b9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -39,7 +39,7 @@ services: - ROOT_URL=http://localhost # Wekan Export Board works when WITH_API='true'. # If you disable Wekan API with 'false', Export Board does not work. - - WITH_API=true + - WITH_API='true' # Optional: Integration with Matomo https://matomo.org that is installed to your server # The address of the server where Matomo is hosted: # - MATOMO_ADDRESS='https://example.com/matomo' @@ -52,7 +52,7 @@ services: # Enable browser policy and allow one trusted URL that can have iframe that has Wekan embedded inside. # Setting this to false is not recommended, it also disables all other browser policy protections # and allows all iframing etc. See wekan/server/policy.js - - BROWSER_POLICY_ENABLED=true + - BROWSER_POLICY_ENABLED='true' # When browser policy is enabled, HTML code at this Trusted URL can have iframe that embeds Wekan inside. - TRUSTED_URL='' depends_on: From bec12567274876428447f879a7974017b1636396 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Tue, 14 Aug 2018 17:36:03 +0300 Subject: [PATCH 3/6] Try to fix Docker env variables. --- Dockerfile | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/Dockerfile b/Dockerfile index a548adf19..9d981a6ce 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,21 +22,21 @@ ARG TRUSTED_URL # DOES NOT WORK: paxctl fix for alpine linux: https://github.com/wekan/wekan/issues/1303 # ENV BUILD_DEPS="paxctl" ENV BUILD_DEPS="apt-utils gnupg gosu wget curl bzip2 build-essential python git ca-certificates gcc-7" -ENV NODE_VERSION ${NODE_VERSION:-v8.12.0} -ENV METEOR_RELEASE ${METEOR_RELEASE:-1.6.0.1} -ENV USE_EDGE ${USE_EDGE:-false} -ENV METEOR_EDGE ${METEOR_EDGE:-1.5-beta.17} -ENV NPM_VERSION ${NPM_VERSION:-latest} -ENV FIBERS_VERSION ${FIBERS_VERSION:-2.0.0} -ENV ARCHITECTURE ${ARCHITECTURE:-linux-x64} -ENV SRC_PATH ${SRC_PATH:-./} -ENV WITH_API ${WITH_API:-true} -ENV MATOMO_ADDRESS ${MATOMO_ADDRESS:-} -ENV MATOMO_SITE_ID ${MATOMO_SITE_ID:-} -ENV MATOMO_DO_NOT_TRACK ${MATOMO_DO_NOT_TRACK:-false} -ENV MATOMO_WITH_USERNAME ${MATOMO_WITH_USERNAME:-true} -ENV BROWSER_POLICY_ENABLED ${BROWSER_POLICY_ENABLED:-true} -ENV TRUSTED_URL ${TRUSTED_URL:-} +ENV NODE_VERSION ${NODE_VERSION:-"v8.12.0"} +ENV METEOR_RELEASE ${METEOR_RELEASE:-"1.6.0.1"} +ENV USE_EDGE ${USE_EDGE:-"false"} +ENV METEOR_EDGE ${METEOR_EDGE:-"1.5-beta.17"} +ENV NPM_VERSION ${NPM_VERSION:-"latest"} +ENV FIBERS_VERSION ${FIBERS_VERSION:-"2.0.0"} +ENV ARCHITECTURE ${ARCHITECTURE:-"linux-x64"} +ENV SRC_PATH ${SRC_PATH:-"./"} +ENV WITH_API ${WITH_API:-"true"} +ENV MATOMO_ADDRESS ${MATOMO_ADDRESS:-""} +ENV MATOMO_SITE_ID ${MATOMO_SITE_ID:-""} +ENV MATOMO_DO_NOT_TRACK ${MATOMO_DO_NOT_TRACK:-"false"} +ENV MATOMO_WITH_USERNAME ${MATOMO_WITH_USERNAME:-"true"} +ENV BROWSER_POLICY_ENABLED ${BROWSER_POLICY_ENABLED:-"true"} +ENV TRUSTED_URL ${TRUSTED_URL:-""} # Copy the app to the image COPY ${SRC_PATH} /home/wekan/app From f725291e148912e5cde97d3747aecbc73925b9d8 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Tue, 14 Aug 2018 18:27:37 +0300 Subject: [PATCH 4/6] Try to fix Dockerfile. --- Dockerfile | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9d981a6ce..77cd648ec 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,22 +21,22 @@ ARG TRUSTED_URL # Set the environment variables (defaults where required) # DOES NOT WORK: paxctl fix for alpine linux: https://github.com/wekan/wekan/issues/1303 # ENV BUILD_DEPS="paxctl" -ENV BUILD_DEPS="apt-utils gnupg gosu wget curl bzip2 build-essential python git ca-certificates gcc-7" -ENV NODE_VERSION ${NODE_VERSION:-"v8.12.0"} -ENV METEOR_RELEASE ${METEOR_RELEASE:-"1.6.0.1"} -ENV USE_EDGE ${USE_EDGE:-"false"} -ENV METEOR_EDGE ${METEOR_EDGE:-"1.5-beta.17"} -ENV NPM_VERSION ${NPM_VERSION:-"latest"} -ENV FIBERS_VERSION ${FIBERS_VERSION:-"2.0.0"} -ENV ARCHITECTURE ${ARCHITECTURE:-"linux-x64"} -ENV SRC_PATH ${SRC_PATH:-"./"} -ENV WITH_API ${WITH_API:-"true"} -ENV MATOMO_ADDRESS ${MATOMO_ADDRESS:-""} -ENV MATOMO_SITE_ID ${MATOMO_SITE_ID:-""} -ENV MATOMO_DO_NOT_TRACK ${MATOMO_DO_NOT_TRACK:-"false"} -ENV MATOMO_WITH_USERNAME ${MATOMO_WITH_USERNAME:-"true"} -ENV BROWSER_POLICY_ENABLED ${BROWSER_POLICY_ENABLED:-"true"} -ENV TRUSTED_URL ${TRUSTED_URL:-""} +ENV BUILD_DEPS="apt-utils gnupg gosu wget curl bzip2 build-essential python git ca-certificates gcc-7" \ + NODE_VERSION=v8.12.0 \ + METEOR_RELEASE=1.6.0.1 \ + USE_EDGE=false \ + METEOR_EDGE=1.5-beta.17 \ + NPM_VERSION=latest \ + FIBERS_VERSION=2.0.0 \ + ARCHITECTURE=linux-x64 \ + SRC_PATH=./ \ + WITH_API=true \ + MATOMO_ADDRESS="" \ + MATOMO_SITE_ID="" \ + MATOMO_DO_NOT_TRACK=false \ + MATOMO_WITH_USERNAME=true \ + BROWSER_POLICY_ENABLED=true \ + TRUSTED_URL="" # Copy the app to the image COPY ${SRC_PATH} /home/wekan/app From eea077e57e7a61d6fefc8918990d6a9015146359 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Tue, 14 Aug 2018 18:43:09 +0300 Subject: [PATCH 5/6] Fix quotes. --- docker-compose.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index c46b3e3b9..ee87227b5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -39,20 +39,20 @@ services: - ROOT_URL=http://localhost # Wekan Export Board works when WITH_API='true'. # If you disable Wekan API with 'false', Export Board does not work. - - WITH_API='true' + - WITH_API=true # Optional: Integration with Matomo https://matomo.org that is installed to your server # The address of the server where Matomo is hosted: - # - MATOMO_ADDRESS='https://example.com/matomo' + # - MATOMO_ADDRESS=https://example.com/matomo # The value of the site ID given in Matomo server for Wekan - # - MATOMO_SITE_ID='123456789' + # - MATOMO_SITE_ID=123456789 # The option do not track which enables users to not be tracked by matomo" - # - MATOMO_DO_NOT_TRACK='false' + # - MATOMO_DO_NOT_TRACK=false # The option that allows matomo to retrieve the username: - # - MATOMO_WITH_USERNAME='true' + # - MATOMO_WITH_USERNAME=true # Enable browser policy and allow one trusted URL that can have iframe that has Wekan embedded inside. # Setting this to false is not recommended, it also disables all other browser policy protections # and allows all iframing etc. See wekan/server/policy.js - - BROWSER_POLICY_ENABLED='true' + - BROWSER_POLICY_ENABLED=true # When browser policy is enabled, HTML code at this Trusted URL can have iframe that embeds Wekan inside. - TRUSTED_URL='' depends_on: From c2eb300e21d03c2ca66f4a80fc77c52aeb11a31d Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Tue, 14 Aug 2018 18:50:05 +0300 Subject: [PATCH 6/6] v1.31 - Fix: Export of Board does not work on Docker. Thanks to xet7 ! Closes #1820 --- CHANGELOG.md | 8 ++++++++ package.json | 2 +- sandstorm-pkgdef.capnp | 4 ++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 46a6f0148..7a4db4987 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +# v1.31 2018-08-14 Wekan release + +This release fixes the following bugs: + +- [Export of Board does not work on Docker](https://github.com/wekan/wekan/issues/1820). + +Thanks to GitHub user xet7 for contributions. + # v1.30 2018-08-14 Wekan release This release add the following new features: diff --git a/package.json b/package.json index 03c1346a4..2617ef02b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "1.30.0", + "version": "1.31.0", "description": "The open-source Trello-like kanban", "private": true, "scripts": { diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index c07f32127..24107a1c6 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 = 115, + appVersion = 116, # Increment this for every release. - appMarketingVersion = (defaultText = "1.30.0~2018-08-14"), + appMarketingVersion = (defaultText = "1.31.0~2018-08-14"), # Human-readable presentation of the app version. minUpgradableAppVersion = 0,