diff options
author | Lauri Ojansivu <x@xet7.org> | 2019-06-11 17:48:08 +0300 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2019-06-11 17:48:08 +0300 |
commit | f154c0338572fa09b3134d177c76e534c5947ed4 (patch) | |
tree | 524ea7c9396d54a93c9aeab989ac3bc86b018cc0 /Dockerfile | |
parent | 526e10865ff0c2c4465ead8ae14328ebf0d40257 (diff) | |
parent | e1e20275a673d3065c6cf239db8d2f1a505baa69 (diff) | |
download | wekan-f154c0338572fa09b3134d177c76e534c5947ed4.tar.gz wekan-f154c0338572fa09b3134d177c76e534c5947ed4.tar.bz2 wekan-f154c0338572fa09b3134d177c76e534c5947ed4.zip |
Merge branch 'edge' into meteor-1.8
Diffstat (limited to 'Dockerfile')
-rw-r--r-- | Dockerfile | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -41,7 +41,7 @@ ENV BUILD_DEPS="apt-utils bsdtar gnupg gosu wget curl bzip2 build-essential pyth OAUTH2_USERNAME_MAP="" \ OAUTH2_FULLNAME_MAP="" \ OAUTH2_ID_TOKEN_WHITELIST_FIELDS=[] \ - OAUTH2_REQUEST_PERMISSIONS=['openid','profiles','email'] \ + OAUTH2_REQUEST_PERMISSIONS='openid profiles email' \ OAUTH2_EMAIL_MAP="" \ LDAP_ENABLE=false \ LDAP_PORT=389 \ @@ -99,6 +99,8 @@ ENV BUILD_DEPS="apt-utils bsdtar gnupg gosu wget curl bzip2 build-essential pyth LOGOUT_ON_HOURS="" \ LOGOUT_ON_MINUTES="" \ CORS="" \ + CORS_ALLOW_HEADERS="" \ + CORS_EXPOSE_HEADERS="" \ DEFAULT_AUTHENTICATION_METHOD="" # Copy the app to the image |