summaryrefslogtreecommitdiffstats
path: root/Dockerfile
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2018-12-21 22:24:21 +0200
committerLauri Ojansivu <x@xet7.org>2018-12-21 22:24:21 +0200
commit5b227b2b4f65f4af2fd9328f8336111277699d71 (patch)
tree362622caadaa397d13a4947718e30692c79d26bc /Dockerfile
parent16fe2be04d75a968a7a79db330a618a9062522f0 (diff)
parent96f33e4052f57706c91a1780a2ad7d77da347021 (diff)
downloadwekan-5b227b2b4f65f4af2fd9328f8336111277699d71.tar.gz
wekan-5b227b2b4f65f4af2fd9328f8336111277699d71.tar.bz2
wekan-5b227b2b4f65f4af2fd9328f8336111277699d71.zip
Merge branch 'edge' into meteor-1.8
Diffstat (limited to 'Dockerfile')
-rw-r--r--Dockerfile6
1 files changed, 4 insertions, 2 deletions
diff --git a/Dockerfile b/Dockerfile
index 1383883e..896012f9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -70,12 +70,13 @@ ARG LOGOUT_IN
ARG LOGOUT_ON_HOURS
ARG LOGOUT_ON_MINUTES
ARG CORS
+ARG DEFAULT_AUTHENTICATION_METHOD
# 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 bsdtar gnupg gosu wget curl bzip2 build-essential python git ca-certificates gcc-7" \
- NODE_VERSION=v8.14.0 \
+ NODE_VERSION=v8.14.1 \
METEOR_RELEASE=1.6.0.1 \
USE_EDGE=false \
METEOR_EDGE=1.5-beta.17 \
@@ -142,7 +143,8 @@ ENV BUILD_DEPS="apt-utils bsdtar gnupg gosu wget curl bzip2 build-essential pyth
LOGOUT_IN="" \
LOGOUT_ON_HOURS="" \
LOGOUT_ON_MINUTES="" \
- CORS=""
+ CORS="" \
+ DEFAULT_AUTHENTICATION_METHOD=""
# Copy the app to the image
COPY ${SRC_PATH} /home/wekan/app