summaryrefslogtreecommitdiffstats
path: root/Dockerfile
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2018-12-03 16:05:24 +0200
committerLauri Ojansivu <x@xet7.org>2018-12-03 16:05:24 +0200
commitb788deb002aab83fc127d1a8b3f47670258dbb6a (patch)
treeb5002784383ddc73258af9f2b68babd548c0be65 /Dockerfile
parentfa6b2e567910c5dbe007ab3482a64c9007614788 (diff)
downloadwekan-b788deb002aab83fc127d1a8b3f47670258dbb6a.tar.gz
wekan-b788deb002aab83fc127d1a8b3f47670258dbb6a.tar.bz2
wekan-b788deb002aab83fc127d1a8b3f47670258dbb6a.zip
- Add CORS https://enable-cors.org/server_meteor.html
- Add missing LDAP and TIMER environment variables. Thanks to xet7 ! Closes wekan/wekan-snap#69
Diffstat (limited to 'Dockerfile')
-rw-r--r--Dockerfile4
1 files changed, 3 insertions, 1 deletions
diff --git a/Dockerfile b/Dockerfile
index 96749eb0..966e0e1d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -69,6 +69,7 @@ ARG LOGOUT_WITH_TIMER
ARG LOGOUT_IN
ARG LOGOUT_ON_HOURS
ARG LOGOUT_ON_MINUTES
+ARG CORS
# Set the environment variables (defaults where required)
# DOES NOT WORK: paxctl fix for alpine linux: https://github.com/wekan/wekan/issues/1303
@@ -140,7 +141,8 @@ ENV BUILD_DEPS="apt-utils bsdtar gnupg gosu wget curl bzip2 build-essential pyth
LOGOUT_WITH_TIMER="false" \
LOGOUT_IN="" \
LOGOUT_ON_HOURS="" \
- LOGOUT_ON_MINUTES=""
+ LOGOUT_ON_MINUTES="" \
+ CORS=""
# Copy the app to the image
COPY ${SRC_PATH} /home/wekan/app