Merge branch 'edge' into meteor-1.8

This commit is contained in:
Lauri Ojansivu 2019-05-22 21:48:52 +03:00
commit 526e10865f
15 changed files with 127 additions and 31 deletions

View file

@ -40,6 +40,8 @@ ENV BUILD_DEPS="apt-utils bsdtar gnupg gosu wget curl bzip2 build-essential pyth
OAUTH2_ID_MAP="" \
OAUTH2_USERNAME_MAP="" \
OAUTH2_FULLNAME_MAP="" \
OAUTH2_ID_TOKEN_WHITELIST_FIELDS=[] \
OAUTH2_REQUEST_PERMISSIONS=['openid','profiles','email'] \
OAUTH2_EMAIL_MAP="" \
LDAP_ENABLE=false \
LDAP_PORT=389 \