Merge branch 'release-0.6.0' into stable

Dockerfile

@@ -15,6 +15,9 @@ ENV LDAP_DOMAIN example.com
 # Disable SSH
 RUN rm -rf /etc/service/sshd /etc/my_init.d/00_regen_ssh_host_keys.sh
 
+# DIsable nginx and php
+RUN rm -rf /etc/service/nginx /etc/service/php5-fpm
+
 # Use baseimage-docker's init system.
 CMD ["/sbin/my_init"]
 

README.md

@@ -23,6 +23,7 @@ and optionaly `dhparam.pem` this file is genereted automaticaly if not present.
 
     docker run --dns=127.0.0.1 \
                -v /data/ldap/db:/var/lib/ldap \
+               -v /data/ldap/config:/etc/ldap/slapd.d \
                -v /data/ldap/ssl/:/etc/ldap/ssl \
                -v /data/ldap/log/:/var/log \
                -e LDAP_DOMAIN=example.com \

slapd.sh

@@ -46,9 +46,6 @@ fi
 if [ ! -e /etc/ldap/config/docker_bootstrapped ]; then
   status "Custom config"
 
-  # permission error on /etc/ldap/slapd.conf if not set?! :'(
-  adduser openldap root
-
   slapd -h "ldapi:///" -u openldap -g openldap 
   chown -R openldap:openldap /etc/ldap
 

test/build.sh

@@ -4,5 +4,5 @@ dir=$(dirname $0)
 . $dir/tools/config.prop
 
 docker.io build -t $openldapTestImage .
-#docker.io build --no-cache=true -t openldap-test .
+#docker.io build --no-cache=true -t $openldapTestImage .
 

test/tools/delete-container.sh

@@ -6,6 +6,6 @@
 res=$(docker.io ps -a | grep -c "$openldapTestContainer")
 
 if [ $res -ne 0 ]; then
-  docker.io stop openldap-test-container
-  docker.io rm openldap-test-container
+  docker.io stop $openldapTestContainer
+  docker.io rm $openldapTestContainer
 fi

test/tools/delete-image.sh

@@ -6,5 +6,5 @@
 res=$(docker.io images | grep -c "$openldapTestImage")
 
 if [ $res -ne 0 ]; then
-  docker.io rmi openldap-test
+  docker.io rmi $openldapTestImage
 fi