Merge branch 'edge' into meteor-1.8

This commit is contained in:
Lauri Ojansivu 2019-05-10 23:20:17 +03:00
commit df69ade422
13 changed files with 173 additions and 104 deletions

View file

@ -61,6 +61,7 @@ ENV BUILD_DEPS="apt-utils bsdtar gnupg gosu wget curl bzip2 build-essential pyth
LDAP_ENCRYPTION=false \
LDAP_CA_CERT="" \
LDAP_REJECT_UNAUTHORIZED=false \
LDAP_USER_AUTHENTICATION=false \
LDAP_USER_SEARCH_FILTER="" \
LDAP_USER_SEARCH_SCOPE="" \
LDAP_USER_SEARCH_FIELD="" \