Merge branch 'hotfix-0.9.2' into stable

Dockerfile

@@ -1,4 +1,4 @@
-FROM osixia/baseimage:0.5.0
+FROM osixia/baseimage:0.6.0
 MAINTAINER Bertrand Gouny <bertrand.gouny@osixia.fr>
 
 # From Nick Stenning's work
@@ -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

@@ -1,5 +1,5 @@
 NAME = osixia/openldap
-VERSION = 0.8.0
+VERSION = 0.9.2
 
 .PHONY: all build test tag_latest release
 
@@ -9,7 +9,7 @@ build:
 	docker.io build -t $(NAME):$(VERSION) --rm .
 
 test:
-	env NAME=$(NAME) VERSION=$(VERSION) ./test.sh
+	env NAME=$(NAME) VERSION=$(VERSION) ./test.sh debug
 
 tag_latest:
 	docker.io tag $(NAME):$(VERSION) $(NAME):latest

service/slapd/slapd.sh

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

test/tools/end.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+
+rm -rf $testDir
 ./test/tools/delete-container.sh 
 ./test/tools/delete-image.sh > /dev/null 2>&1
 

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

@@ -1,7 +1,7 @@
 #!/bin/sh
 
-echo "docker.io run --name $testContainer $runOptions -d $testImage"
+echo "docker.io run --name $testContainer $runOptions -d $testImage $runCommand"
-ID=`docker.io run --name $testContainer $runOptions -d $testImage`
+ID=`docker.io run --name $testContainer $runOptions -d $testImage $runCommand`
 sleep 10
 
 echo " --> Obtaining IP"