test

image/Dockerfile

@@ -13,7 +13,7 @@ RUN apt-get -y update && /sbin/install-service-available ssl-helper-gnutls \
 	slapd ldap-utils \
 	&& rm -rf /var/lib/ldap /etc/ldap/slapd.d
 
-# Add service directory to /osixia
+# Add service directory to /osixia/service
 ADD service /osixia/service
 
 # Use baseimage install-service script and clean all

image/env.yml

@@ -24,5 +24,3 @@ REPLICATION_HDB_SYNCPROV: binddn="cn=admin,$BASE_DN" bindmethod=simple credentia
 REPLICATION_HOSTS:
   - ldap://ldap.example.org # The order must be the same on all ldap servers
   - ldap://ldap2.example.org
-
-IS_REPLICATION_TEST: false

image/service/slapd/container-start.sh

@@ -234,6 +234,12 @@ EOF
     ldapmodify -c -Y EXTERNAL -Q -H ldapi:/// -f /osixia/service/slapd/assets/config/replication/replication-disable.ldif || true
 
   fi
+  
+  # stop OpenLDAP
+  SLAPD_PID=$(cat /run/slapd/slapd.pid)
+  echo "Kill slapd, pid: $SLAPD_PID"
+  kill -INT $SLAPD_PID
+  echo "ok"
 
   touch $FIRST_START_DONE
 fi

image/service/slapd/daemon.sh

@@ -5,18 +5,6 @@
 # see https://github.com/docker/docker/issues/8231
 ulimit -n 1024
 
-# stop OpenLDAP
-SLAPD_PID=$(cat /run/slapd/slapd.pid)
-echo "Kill slapd, pid: $SLAPD_PID"
-kill -INT $SLAPD_PID
-echo "ok"
-
-sleep 5
-
-# special replication test config
-if [ "${IS_REPLICATION_TEST,,}" == "true" ]; then
-  echo "test wait 10 seconds"
-  sleep 10
-fi
+sleep 3
 
 exec /usr/sbin/slapd -h "ldap://$HOSTNAME ldaps://$HOSTNAME ldapi:///" -u openldap -g openldap -d $LDAP_LOG_LEVEL