Merge branch 'hotfix-0.7.3' 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
-# add -v /some/host/directory:/var/lib/ldap to the run command
+# /!\ To store the data outside the container, 
+# 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
@@ -23,9 +23,11 @@ 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 \
                -e LDAP_ORGANISATION="Example Corp." \
                -e LDAP_ROOTPASS=toor \
                -p 389:389 -d osixia/openldap
+

service/slapd/slapd.sh

@@ -6,19 +6,17 @@ status () {
   echo "---> ${@}" >&2
 }
 
+
+set -x
+: LDAP_ADMIN_PWD=${LDAP_ADMIN_PWD}
+: LDAP_DOMAIN=${LDAP_DOMAIN}
+: LDAP_ORGANISATION=${LDAP_ORGANISATION}
+
+
+############ Base config ############
 if [ ! -e /var/lib/ldap/docker_bootstrapped ]; then
-  status "configuring slapd for first run"
+  status "configuring slapd database"
 
-  set -x
-  : LDAP_ADMIN_PWD=${LDAP_ADMIN_PWD}
-  : LDAP_DOMAIN=${LDAP_DOMAIN}
-  : LDAP_ORGANISATION=${LDAP_ORGANISATION}
-
-
-  # permission error on /etc/ldap/slapd.conf if not set?! :'(
-  adduser openldap root
-
-  ############ Base config ############
   cat <<EOF | debconf-set-selections
 slapd slapd/internal/generated_adminpw password ${LDAP_ADMIN_PWD}
 slapd slapd/internal/adminpw password ${LDAP_ADMIN_PWD}
@@ -37,9 +35,19 @@ EOF
 
   dpkg-reconfigure -f noninteractive slapd
 
-  ############ Custom config ############
-  slapd -h "ldap:/// ldapi:///" -u openldap -g openldap 
-  chown -R openldap:openldap /etc/ldap
+  touch /var/lib/ldap/docker_bootstrapped
+
+else
+  status "slapd database found"
+fi
+
+
+############ Custom config ############
+if [ ! -e /etc/ldap/config/docker_bootstrapped ]; then
+  status "Custom config"
+
+  slapd -h "ldapi:///" -u openldap -g openldap 
+  chown -R openldap:openldap /etc/ldap 
 
   # TLS
   if [ -e /etc/ldap/ssl/ldap.crt ] && [ -e /etc/ldap/ssl/ldap.key ] && [ -e /etc/ldap/ssl/ca.crt ]; then
@@ -69,9 +77,7 @@ EOF
 
   kill -INT `cat /run/slapd/slapd.pid`
 
-  unset LDAP_ADMIN_PWD
-
-  touch /var/lib/ldap/docker_bootstrapped
+ touch /etc/ldap/config/docker_bootstrapped
 
 else
   status "found already-configured slapd"
@@ -79,4 +85,6 @@ fi
 
 status "starting slapd on default port 389"
 set -x
-exec /usr/sbin/slapd -h "ldap:///" -u openldap -g openldap -d -1
+#with debug:
+#exec /usr/sbin/slapd -h "ldap:///" -u openldap -g openldap -d -1
+exec /usr/sbin/slapd -h "ldap:///" -u openldap -g openldap 

test.sh

@@ -1,48 +1,15 @@
 #!/bin/sh
 
-# Tests
-error=0
-ok=0
+# Usage
+# sudo ./test.sh 
+# add -v for verbose mode (or type whatever you like !) :p
 
-echo_start () {
-  echo "------- Start $* test -------"
-}
+. test/tools/run.sh
 
-echo_error () {
-  echo "\n$(tput setaf 1)/!\ $* failed$(tput sgr0)\n"
-  error=`expr $error + 1`
-}
+run_test tools/build-container.sh "Successfully built"
+run_test simple.sh "dn: dc=example,dc=com"
+run_test tls.sh "dn: dc=example,dc=com"
+run_test db.sh "dn: dc=otherdomain,dc=com"
 
-echo_ok () {
-  echo "\n--> $* ok\n"
-  ok=`expr $ok + 1`
-}
-
-run_test () {
-  fction=$1
-  out=test/test.out
-
-  echo_start $fction
-
-  #./test/$1.sh | tee $out 2>&1
-  ./test/$1.sh > $out 2>&1
-  
-  if [ "$(grep -c "$2" $out)" -eq 0 ]; then
-    echo_error $fction
-  else
-    echo_ok  $fction
-  fi
-
-  rm $out
-}
-
-
-./test/tools/prepare.sh
-run_test build "Successfully built"
-run_test run-simple "dn: dc=example,dc=com"
-run_test run-tls "dn: dc=example,dc=com"
-./test/tools/end.sh
-
-echo "------- Test finished -------"
-echo $error " failed " $ok " passed"
+. test/tools/end.sh
 

test/build.sh

@@ -1,4 +0,0 @@
-#!/bin/sh
-#sudo docker.io build -t openldap-test .
-sudo docker.io build --no-cache=true -t openldap-test .
-

test/db.sh

@@ -0,0 +1,24 @@
+#!/bin/sh
+
+dir=$(dirname $0)
+. $dir/tools/config.prop
+
+if [ -d "$testDir" ]; then
+  rm -r $testDir
+fi
+
+mkdir $testDir
+mkdir $testDir/db
+mkdir $testDir/config
+
+runOptions="-e LDAP_DOMAIN=otherdomain.com -v $testDir/db:/var/lib/ldap -v $testDir/config:/etc/ldap/slapd.d"
+. $dir/tools/run-container.sh
+$dir/tools/delete-container.sh
+
+runOptions="-v $testDir/db:/var/lib/ldap -v $testDir/config:/etc/ldap/slapd.d"
+. $dir/tools/run-container.sh
+echo "ldapsearch -x -h $IP -b dc=otherdomain,dc=com"
+ldapsearch -x -h $IP -b dc=otherdomain,dc=com
+
+rm -r $testDir
+$dir/tools/delete-container.sh

test/run-simple.sh

@@ -1,7 +0,0 @@
-#!/bin/sh
-
-docker.io run --name openldap-test-container -p 65389:389 -d openldap-test
-sleep 5
-ldapsearch -x -h localhost -p 65389 -b dc=example,dc=com
-
-$(pwd)/test/tools/delete-container.sh

test/run-tls.sh

@@ -1,21 +0,0 @@
-#!/bin/sh
-
-docker.io run  --name openldap-test-container --dns=127.0.0.1 -v `pwd`/test/ssl:/etc/ldap/ssl -p 65389:389 -d openldap-test
-
-cert=$(echo `pwd`/test/ssl/ldap.crt)
-certCN=$(openssl x509 -in $cert -subject -noout | sed -n 's/.*CN=\(.*\)\/*\(.*\)/\1/p')
-addLine=$(echo "127.0.0.1" $certCN)
-
-echo $addLine >> /etc/hosts
-cp /etc/ldap/ldap.conf /etc/ldap/ldap.conf.old
-sed -i 's,TLS_CACERT.*,TLS_CACERT '"$cert"',g' /etc/ldap/ldap.conf
-
-
-sleep 5
-ldapsearch -x -h $certCN -p 65389 -b dc=example,dc=com -ZZ
-
-sed -i '/'"$addLine"'/d' /etc/hosts
-cp /etc/ldap/ldap.conf.old /etc/ldap/ldap.conf
-rm /etc/ldap/ldap.conf.old
-
-$(pwd)/test/tools/delete-container.sh

test/simple.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+dir=$(dirname $0)
+. $dir/tools/config.prop
+
+. $dir/tools/run-container.sh
+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

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+dir=$(dirname $0)
+. $dir/tools/config.prop
+
+. $dir/tls/run.sh
+echo "ldapsearch -x -h $certCN -b dc=example,dc=com -ZZ"
+ldapsearch -x -h $certCN -b dc=example,dc=com -ZZ
+
+. $dir/tls/end.sh

test/tls/end.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+sed -i '/'"$addLine"'/d' /etc/hosts
+cp /etc/ldap/ldap.conf.old /etc/ldap/ldap.conf
+rm /etc/ldap/ldap.conf.old
+
+$dir/tools/delete-container.sh

test/tls/run.sh

@@ -0,0 +1,16 @@
+#!/bin/sh
+
+
+runOptions="--dns=127.0.0.1 -v `pwd`/test/tls/ssl:/etc/ldap/ssl"
+. $dir/tools/run-container.sh
+
+cert=$(echo $dir/tls/ssl/ldap.crt)
+certCN=$(openssl x509 -in $cert -subject -noout | sed -n 's/.*CN=\(.*\)\/*\(.*\)/\1/p')
+addLine=$(echo $IP $certCN)
+
+echo $addLine >> /etc/hosts
+cp /etc/ldap/ldap.conf /etc/ldap/ldap.conf.old
+sed -i 's,TLS_CACERT.*,TLS_CACERT '"$cert"',g' /etc/ldap/ldap.conf
+
+sleep 5
+

test/tools/build-container.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+. $(dirname $0)/config.prop
+
+docker.io build -t $testImage .
+#docker.io build --no-cache=true -t $testImage .
+

test/tools/config.prop

@@ -0,0 +1,3 @@
+testImage=openldap-test
+testContainer=openldap-test-container
+testDir=/osixia-test-docker-openldap

test/tools/delete-container.sh

@@ -1,11 +1,11 @@
 #!/bin/sh
 
-# remove openldap test container
-docker.io ps -a > testcontainer.out
+. $(dirname $0)/config.prop
 
-if [ "$(grep -c "openldap-test-container" ./testcontainer.out)" -ne 0 ]; then
-  docker.io stop openldap-test-container
-  docker.io rm openldap-test-container
+# remove test container
+res=$(docker.io ps -a | grep -c "$testContainer")
+
+if [ $res -ne 0 ]; then
+  docker.io stop $testContainer
+  docker.io rm $testContainer
 fi
-
-rm testcontainer.out

test/tools/delete-image.sh

@@ -1,10 +1,10 @@
 #!/bin/sh
 
-# remove openldap test image
-docker.io images > testimage.out
+. $(dirname $0)/config.prop
 
-if [ "$(grep -c "openldap-test" ./testimage.out)" -ne 0 ]; then
-  docker.io rmi openldap-test
+# remove test image
+res=$(docker.io images | grep -c "$testImage")
+
+if [ $res -ne 0 ]; then
+  #docker.io rmi $testImage
 fi
-
-rm testimage.out

test/tools/end.sh

@@ -1,4 +1,8 @@
 #!/bin/sh
 
-./test/tools/delete-container.sh
-./test/tools/delete-image.sh
+dir=$(dirname $0)
+$dir/delete-container.sh > /dev/null 2>&1
+$dir/delete-image.sh > /dev/null 2>&1
+
+echo "------- End -------"
+echo $error " failed " $ok " succeeded"

test/tools/prepare.sh

@@ -1,3 +1,5 @@
 #!/bin/sh
 
-./test/tools/delete-container.sh
+dir=$(dirname $0)
+$dir/delete-container.sh
+$dir/delete-image.sh

test/tools/run-container.sh

@@ -0,0 +1,14 @@
+#!/bin/sh
+
+echo "docker.io run --name $testContainer $runOptions -d $testImage"
+ID=`docker.io run --name $testContainer $runOptions -d $testImage`
+sleep 7
+
+echo " --> Obtaining IP"
+IP=`docker inspect -f "{{ .NetworkSettings.IPAddress }}" $ID`
+if [ "$IP" = "" ]; then
+	abort "Unable to obtain container IP"
+	exit 1
+else
+  echo " -->" $IP
+fi

test/tools/run.sh

@@ -0,0 +1,46 @@
+#!/bin/sh
+
+# Usage
+# sudo ./test.sh 
+# add -v for verbose mode (or type whatever you like !) :p
+
+verbose=$1
+error=0
+ok=0
+
+echo_start () {
+  echo "------- Test: $* -------"
+}
+
+echo_error () {
+  echo "\n$(tput setaf 1)/!\ $* failed$(tput sgr0)\n"
+  error=`expr $error + 1`
+}
+
+echo_ok () {
+  echo "\n--> $* ok\n"
+  ok=`expr $ok + 1`
+}
+
+run_test () {
+  test=$1
+  out=test/test.out
+
+  echo_start $test
+
+  if [ -z ${verbose} ]; then
+    ./test/$test > $out 2>&1
+  else
+    ./test/$test | tee $out 2>&1
+  fi
+  
+  if [ "$(grep -c "$2" $out)" -eq 0 ]; then
+    echo_error $test
+  else
+    echo_ok  $test
+  fi
+
+  rm $out
+}
+
+./test/tools/prepare.sh > /dev/null 2>&1