diff options
author | Lauri Ojansivu <x@xet7.org> | 2018-08-14 18:52:19 +0300 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2018-08-14 18:52:19 +0300 |
commit | 89b535ac0ffa5c6858761ff8ca894b711ebf0ef9 (patch) | |
tree | 228452d712276d07f282995bc388c2ec8e9f7cda | |
parent | ac12aa7edeb1ea6ec63d6bce795e2f042032ff56 (diff) | |
parent | c2eb300e21d03c2ca66f4a80fc77c52aeb11a31d (diff) | |
download | wekan-89b535ac0ffa5c6858761ff8ca894b711ebf0ef9.tar.gz wekan-89b535ac0ffa5c6858761ff8ca894b711ebf0ef9.tar.bz2 wekan-89b535ac0ffa5c6858761ff8ca894b711ebf0ef9.zip |
Merge branch 'devel'
-rw-r--r-- | CHANGELOG.md | 8 | ||||
-rw-r--r-- | Dockerfile | 32 | ||||
-rw-r--r-- | docker-compose.yml | 10 | ||||
-rw-r--r-- | package.json | 2 | ||||
-rw-r--r-- | sandstorm-pkgdef.capnp | 4 |
5 files changed, 32 insertions, 24 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 46a6f014..7a4db498 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: @@ -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 diff --git a/docker-compose.yml b/docker-compose.yml index 9e96bcf1..ee87227b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -42,19 +42,19 @@ services: - 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 # 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 diff --git a/package.json b/package.json index 03c1346a..2617ef02 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 c07f3212..24107a1c 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, |