Merge branch 'hotfix-0.9.2' into stable

Dockerfile

@@ -1,4 +1,4 @@
-FROM osixia/baseimage
+FROM osixia/baseimage:0.6.0
 MAINTAINER Bertrand Gouny <bertrand.gouny@osixia.fr>
 
 # From Nick Stenning's work
@@ -18,7 +18,7 @@ ENV LDAP_DOMAIN example.com
 # RUN rm -rf /etc/service/sshd /etc/my_init.d/00_regen_ssh_host_keys.sh
 
 # Enable dnsmasq
-RUN /etc/enable-service dnsmasq
+RUN /sbin/enable-service dnsmasq
 
 # Use baseimage-docker's init system.
 CMD ["/sbin/my_init"]
@@ -27,7 +27,7 @@ CMD ["/sbin/my_init"]
 RUN apt-get -y update
 
 # Install openldap (slapd) and ldap-utils
-RUN LC_ALL=C DEBIAN_FRONTEND=noninteractive apt-get install -y slapd ldap-utils openssl
+RUN LC_ALL=C DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends slapd ldap-utils openssl
 
 # Expose ldap default port
 EXPOSE 389

Makefile

@@ -0,0 +1,21 @@
+NAME = osixia/openldap
+VERSION = 0.9.2
+
+.PHONY: all build test tag_latest release
+
+all: build
+
+build:
+	docker.io build -t $(NAME):$(VERSION) --rm .
+
+test:
+	env NAME=$(NAME) VERSION=$(VERSION) ./test.sh debug
+
+tag_latest:
+	docker.io tag $(NAME):$(VERSION) $(NAME):latest
+
+release: build test tag_latest
+	@if ! docker.io images $(NAME) | awk '{ print $$2 }' | grep -q -F $(VERSION); then echo "$(NAME) version $(VERSION) is not yet built. Please run 'make build'"; false; fi
+	docker.io push $(NAME)
+	@echo "*** Don't forget to run 'twgit release finish' :)"
+

service/slapd/slapd.sh

@@ -85,4 +85,5 @@ fi
 
 status "starting slapd on default port 389"
 set -x
+
 exec /usr/sbin/slapd -h "ldap:///" -u openldap -g openldap -d -1

test-repository.sh

@@ -0,0 +1,15 @@
+#!/bin/sh
+
+# Usage
+# sudo ./test.sh 
+# add -v for verbose mode (or type whatever you like !) :p
+
+. test/config-repository
+. test/tools/run.sh
+
+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"
+
+. test/tools/end.sh
+

test.sh

@@ -2,55 +2,15 @@
 
 # Usage
 # sudo ./test.sh 
-# add -v for verbose mode
+# add -v for verbose mode (or type whatever you like !) :p
 
-verbose=$1
+. test/config
-error=0
+. test/tools/run.sh
-ok=0
 
-echo_start () {
+run_test tools/build-container.sh "Successfully built"
-  echo "------- Start $* test -------"
+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_error () {
+. test/tools/end.sh
-  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 () {
-  fction=$1
-  out=test/test.out
-
-  echo_start $fction
-
-  if [ -z ${verbose} ]; then
-    ./test/$1.sh > $out 2>&1
-  else
-    ./test/$1.sh | tee $out 2>&1
-  fi
-  
-  if [ "$(grep -c "$2" $out)" -eq 0 ]; then
-    echo_error $fction
-  else
-    echo_ok  $fction
-  fi
-
-  rm $out
-}
-
-
-./test/tools/prepare.sh > /dev/null 2>&1
-run_test build "Successfully built"
-run_test simple "dn: dc=example,dc=com"
-run_test tls "dn: dc=example,dc=com"
-run_test db "dn: dc=otherdomain,dc=com"
-./test/tools/end.sh > /dev/null 2>&1
-
-echo "------- Test finished -------"
-echo $error " failed " $ok " passed"
 

test/build.sh

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

test/config

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

test/config-repository

@@ -0,0 +1,7 @@
+testImage=osixia/openldap:latest
+testContainer=openldap-repository-test-container
+testDir=/osixia-repository-test-docker-openldap
+
+export testImage
+export testContainer
+export testDir

test/db.sh

@@ -1,24 +1,23 @@
 #!/bin/sh
 
 dir=$(dirname $0)
-. $dir/tools/config.prop
 
-if [ -d "$openldapTestDir" ]; then
+if [ -d "$testDir" ]; then
-  rm -r $openldapTestDir
+  rm -r $testDir
 fi
 
-mkdir $openldapTestDir
+mkdir $testDir
-mkdir $openldapTestDir/db
+mkdir $testDir/db
-mkdir $openldapTestDir/config
+mkdir $testDir/config
 
-runOptions="-e LDAP_DOMAIN=otherdomain.com -v $openldapTestDir/db:/var/lib/ldap -v $openldapTestDir/config:/etc/ldap/slapd.d"
+runOptions="-e LDAP_DOMAIN=otherdomain.com -v $testDir/db:/var/lib/ldap -v $testDir/config:/etc/ldap/slapd.d"
-. $dir/tools/run-simple.sh
+. $dir/tools/run-container.sh
 $dir/tools/delete-container.sh
 
-runOptions="-v $openldapTestDir/db:/var/lib/ldap -v $openldapTestDir/config:/etc/ldap/slapd.d"
+runOptions="-v $testDir/db:/var/lib/ldap -v $testDir/config:/etc/ldap/slapd.d"
-. $dir/tools/run-simple.sh
+. $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 $openldapTestDir
+rm -r $testDir
 $dir/tools/delete-container.sh

test/simple.sh

@@ -1,9 +1,8 @@
 #!/bin/sh
 
 dir=$(dirname $0)
-. $dir/tools/config.prop
+. $dir/tools/run-container.sh
 
-. $dir/tools/run-simple.sh
 echo "ldapsearch -x -h $IP -b dc=example,dc=com"
 ldapsearch -x -h $IP -b dc=example,dc=com
 

test/tls.sh

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

test/tls/run.sh

@@ -1,10 +1,10 @@
 #!/bin/sh
 
 
-runOptions="--dns=127.0.0.1 -v `pwd`/test/ssl:/etc/ldap/ssl"
+runOptions="--dns=127.0.0.1 -v `pwd`/test/tls/ssl:/etc/ldap/ssl"
-. $dir/tools/run-simple.sh
+. $dir/tools/run-container.sh
 
-cert=$(echo $dir/ssl/ldap.crt)
+cert=$(echo $dir/tls/ssl/ldap.crt)
 certCN=$(openssl x509 -in $cert -subject -noout | sed -n 's/.*CN=\(.*\)\/*\(.*\)/\1/p')
 addLine=$(echo $IP $certCN)
 

test/tools/build-container.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+docker.io build -t $testImage .
+#docker.io build --no-cache=true -t $testImage .
+

test/tools/config.prop

@@ -1,3 +0,0 @@
-openldapTestImage=openldap-test
-openldapTestContainer=openldap-test-container
-openldapTestDir=/osixia-test-docker-openldap

test/tools/delete-container.sh

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

test/tools/delete-image.sh

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

test/tools/end.sh

@@ -1,5 +1,15 @@
 #!/bin/sh
 
-dir=$(dirname $0)
+
-$dir/delete-container.sh
+rm -rf $testDir
-$dir/delete-image.sh
+./test/tools/delete-container.sh 
+./test/tools/delete-image.sh > /dev/null 2>&1
+
+echo "------- End -------"
+echo $error " failed " $ok " succeeded"
+
+if [ "$error" -eq 0 ]; then
+  exit 0
+else
+  exit 1
+fi

test/tools/prepare.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+mkdir -p $testDir
+
 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 $runCommand"
+ID=`docker.io run --name $testContainer $runOptions -d $testImage $runCommand`
+sleep 10
+
+echo " --> Obtaining IP"
+IP=`docker.io inspect -f "{{ .NetworkSettings.IPAddress }}" $ID`
+if [ "$IP" = "" ]; then
+	abort "Unable to obtain container IP"
+	exit 1
+else
+  echo " -->" $IP
+fi

test/tools/run-simple.sh

@@ -1,14 +0,0 @@
-#!/bin/sh
-
-echo "docker.io run --name $openldapTestContainer $runOptions -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.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