summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2019-02-11 16:11:15 +0200
committerGitHub <noreply@github.com>2019-02-11 16:11:15 +0200
commit9edf95ec93d640b4cfd37f41a157310ded79f197 (patch)
treec89a37c74fcd83b8e3938c89b1744a0f284dee2e
parent2add875a389037dcb331022d0831b8ae96407e66 (diff)
parentb20309f7aa2162ed7f9b23167c5d8b409f2c6b02 (diff)
downloadwekan-9edf95ec93d640b4cfd37f41a157310ded79f197.tar.gz
wekan-9edf95ec93d640b4cfd37f41a157310ded79f197.tar.bz2
wekan-9edf95ec93d640b4cfd37f41a157310ded79f197.zip
Merge pull request #2181 from danpatdav/debug-oidc
Added debug flag and bumped salleman package version
-rw-r--r--.meteor/versions2
-rw-r--r--Dockerfile2
2 files changed, 3 insertions, 1 deletions
diff --git a/.meteor/versions b/.meteor/versions
index b8b8e4fd..5d4c8e1a 100644
--- a/.meteor/versions
+++ b/.meteor/versions
@@ -144,7 +144,7 @@ retry@1.0.9
routepolicy@1.0.12
rzymek:fullcalendar@3.8.0
salleman:accounts-oidc@1.0.10
-salleman:oidc@1.0.10
+salleman:oidc@1.0.11
service-configuration@1.0.11
session@1.1.7
sha@1.0.9
diff --git a/Dockerfile b/Dockerfile
index 240fb0b7..ff6243d5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,6 +2,7 @@ FROM debian:buster-slim
LABEL maintainer="wekan"
# Declare Arguments
+ARG DEBUG
ARG NODE_VERSION
ARG METEOR_RELEASE
ARG METEOR_EDGE
@@ -76,6 +77,7 @@ ARG DEFAULT_AUTHENTICATION_METHOD
# 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 python3 python3-distutils git ca-certificates gcc-7" \
+ DEBUG=false \
NODE_VERSION=v8.15.0 \
METEOR_RELEASE=1.6.0.1 \
USE_EDGE=false \