Merge branch 'hotfix-0.6.2' into stable

Dockerfile

@@ -9,11 +9,16 @@ ENV LDAP_ADMIN_PWD toor
 ENV LDAP_ORGANISATION Example Inc.
 ENV LDAP_DOMAIN example.com
 
-# /!\ To store the data outside the container, mount /var/lib/ldap as a data volume
+# /!\ To store the data outside the container, 
-# add -v /some/host/directory:/var/lib/ldap to the run command
+# mount /var/lib/ldap and /etc/ldap/slapd.d as a data volume add
+# -v /some/host/directory:/var/lib/ldap and -v /some/other/host/directory:/etc/ldap/slapd.d
+# to the run command
 
 # Disable SSH
-RUN rm -rf /etc/service/sshd /etc/my_init.d/00_regen_ssh_host_keys.sh
+# RUN rm -rf /etc/service/sshd /etc/my_init.d/00_regen_ssh_host_keys.sh
+
+# Enable dnsmasq
+RUN /etc/enable-service dnsmasq
 
 # Use baseimage-docker's init system.
 CMD ["/sbin/my_init"]
@@ -32,11 +37,11 @@ RUN mkdir /etc/ldap/ssl
 
 # Add config directory 
 RUN mkdir /etc/ldap/config
-ADD config /etc/ldap/config
+ADD service/slapd/config /etc/ldap/config
 
 # Add slapd deamon
 RUN mkdir /etc/service/slapd
-ADD slapd.sh /etc/service/slapd/run
+ADD service/slapd/slapd.sh /etc/service/slapd/run
 
 # Clear out the local repository of retrieved package files
 RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

LICENSE.txt

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 Osixia
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -1,4 +1,4 @@
-## docker-openldap
+# docker-openldap
 
 Fork of Nick Stenning docker-slapd :
 https://github.com/nickstenning/docker-slapd
@@ -30,3 +30,4 @@ and optionaly `dhparam.pem` this file is genereted automaticaly if not present.
                -e LDAP_ORGANISATION="Example Corp." \
                -e LDAP_ROOTPASS=toor \
                -p 389:389 -d osixia/openldap
+

service/slapd/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/db.sh

@@ -17,7 +17,8 @@ $dir/tools/delete-container.sh
 
 runOptions="-v $openldapTestDir/db:/var/lib/ldap -v $openldapTestDir/config:/etc/ldap/slapd.d"
 . $dir/tools/run-simple.sh
-ldapsearch -x -h localhost -p 65389 -b dc=otherdomain,dc=com
+echo "ldapsearch -x -h $IP -b dc=otherdomain,dc=com"
+ldapsearch -x -h $IP -b dc=otherdomain,dc=com
 
 rm -r $openldapTestDir
 $dir/tools/delete-container.sh

test/simple.sh

@@ -4,6 +4,7 @@ dir=$(dirname $0)
 . $dir/tools/config.prop
 
 . $dir/tools/run-simple.sh
-ldapsearch -x -h localhost -p 65389 -b dc=example,dc=com
+echo "ldapsearch -x -h $IP -b dc=example,dc=com"
+ldapsearch -x -h $IP -b dc=example,dc=com
 
 $dir/tools/delete-container.sh

test/tls.sh

@@ -4,6 +4,7 @@ dir=$(dirname $0)
 . $dir/tools/config.prop
 
 . $dir/tools/run-tls.sh
-ldapsearch -x -h $certCN -p 65389 -b dc=example,dc=com -ZZ
+echo "ldapsearch -x -h $certCN -b dc=example,dc=com -ZZ"
+ldapsearch -x -h $certCN -b dc=example,dc=com -ZZ
 
 . $dir/tools/end-tls.sh

test/tools/run-simple.sh

@@ -1,5 +1,14 @@
 #!/bin/sh
 
-echo "docker.io run --name $openldapTestContainer $runOptions -p 65389:389 -d $openldapTestImage"
+echo "docker.io run --name $openldapTestContainer $runOptions -d $openldapTestImage"
-docker.io run --name $openldapTestContainer $runOptions -p 65389:389 -d $openldapTestImage
+ID=`docker.io run --name $openldapTestContainer $runOptions -d $openldapTestImage`
 sleep 5
+
+echo " --> Obtaining IP"
+IP=`docker inspect $ID | grep IPAddress | sed -e 's/.*: "//; s/".*//'`
+if [ "$IP" = "" ]; then
+	abort "Unable to obtain container IP"
+	exit 1
+else
+  echo " -->" $IP
+fi

test/tools/run-tls.sh

@@ -6,7 +6,7 @@ runOptions="--dns=127.0.0.1 -v `pwd`/test/ssl:/etc/ldap/ssl"
 
 cert=$(echo $dir/ssl/ldap.crt)
 certCN=$(openssl x509 -in $cert -subject -noout | sed -n 's/.*CN=\(.*\)\/*\(.*\)/\1/p')
-addLine=$(echo "127.0.0.1" $certCN)
+addLine=$(echo $IP $certCN)
 
 echo $addLine >> /etc/hosts
 cp /etc/ldap/ldap.conf /etc/ldap/ldap.conf.old