new baseimage

image/Dockerfile

@@ -2,7 +2,7 @@ FROM osixia/light-baseimage:0.1.0
 MAINTAINER Bertrand Gouny <[email protected]>
 
 # Use baseimage-docker's init system.
-CMD ["/sbin/my_init"]
+CMD ["/osixia/tool/run"]
 
 # Add openldap user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
 RUN groupadd -r openldap && useradd -r -g openldap openldap
@@ -10,7 +10,7 @@ RUN groupadd -r openldap && useradd -r -g openldap openldap
 # Install OpenLDAP, ldap-utils and ssl-kit from baseimage, remove default ldap db
 RUN apt-get -y update && /sbin/install-service-available ssl-helper-gnutls \
 	&& LC_ALL=C DEBIAN_FRONTEND=noninteractive apt-get install -y --force-yes --no-install-recommends \
-	slapd ldap-utils ntp \
+	slapd ldap-utils \
 	&& rm -rf /var/lib/ldap /etc/ldap/slapd.d
 
 # Add service directory to /osixia

image/service/slapd/container-start.sh

@@ -14,8 +14,6 @@ chown -R openldap:openldap /var/lib/ldap
 chown -R openldap:openldap /etc/ldap
 chown -R openldap:openldap /osixia/service/slapd
 
-/etc/init.d/ntp restart
-
 # container first start
 if [ ! -e "$FIRST_START_DONE" ]; then
 
@@ -237,13 +235,6 @@ EOF
 
   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,4 +5,12 @@
 # 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 2
+
 exec /usr/sbin/slapd -h "ldap://$HOSTNAME ldaps://$HOSTNAME ldapi:///" -u openldap -g openldap -d $LDAP_LOG_LEVEL