Merge branch 'lionep-stable' into hotfix-1.2.2

Author: BertrandGouny

image/environment/default.startup.yaml

@@ -56,6 +56,9 @@ KEEP_EXISTING_CONFIG: false
 # Remove config after setup
 LDAP_REMOVE_CONFIG_AFTER_SETUP: true
 
+# Ulimit
+LDAP_NOFILE: 1024
+
 # ssl-helper environment variables prefix
 LDAP_SSL_HELPER_PREFIX: ldap # ssl-helper first search config from LDAP_SSL_HELPER_* variables, before SSL_HELPER_* variables.
 

image/service/slapd/process.sh

@@ -7,6 +7,6 @@ log-helper level eq trace && set -x
 # Reduce maximum number of number of open file descriptors to 1024
 # otherwise slapd consumes two orders of magnitude more of RAM
 # see https://github.com/docker/docker/issues/8231
-ulimit -n 1024
+ulimit -n $LDAP_NOFILE
 
 exec /usr/sbin/slapd -h "ldap://$HOSTNAME ldaps://$HOSTNAME ldapi:///" -u openldap -g openldap -d $LDAP_LOG_LEVEL

image/service/slapd/startup.sh

@@ -8,7 +8,7 @@ log-helper level eq trace && set -x
 # Reduce maximum number of number of open file descriptors to 1024
 # otherwise slapd consumes two orders of magnitude more of RAM
 # see https://github.com/docker/docker/issues/8231
-ulimit -n 1024
+ulimit -n $LDAP_NOFILE
 
 # create dir if they not already exists
 [ -d /var/lib/ldap ] || mkdir -p /var/lib/ldap