Merge branch 'hotfix-0.9.1' 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.1
+
+.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

@@ -46,7 +46,8 @@ fi
 if [ ! -e /etc/ldap/config/docker_bootstrapped ]; then
   status "Custom config"
 
-  slapd -h "ldapi:///" 
+  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
@@ -85,5 +86,5 @@ fi
 status "starting slapd on default port 389"
 set -x
 #with debug:
-#exec /usr/sbin/slapd -h "ldap:///" -d -1
+#exec /usr/sbin/slapd -h "ldap:///" -u openldap -g openldap -d -1
-exec /usr/sbin/slapd -h "ldap:///" 
+exec /usr/sbin/slapd -h "ldap:///" -u openldap -g openldap 

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

@@ -4,6 +4,7 @@
 # sudo ./test.sh 
 # add -v for verbose mode (or type whatever you like !) :p
 
+. test/config
 . test/tools/run.sh
 
 run_test tools/build-container.sh "Successfully built"

test/config

@@ -1,3 +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,7 +1,6 @@
 #!/bin/sh
 
 dir=$(dirname $0)
-. $dir/tools/config.prop
 
 if [ -d "$testDir" ]; then
   rm -r $testDir

test/simple.sh

@@ -1,9 +1,8 @@
 #!/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
 

test/tls.sh

@@ -1,9 +1,8 @@
 #!/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
 

test/tools/build-container.sh

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

test/tools/delete-container.sh

@@ -1,7 +1,5 @@
 #!/bin/sh
 
-. $(dirname $0)/config.prop
-
 # remove test container
 res=$(docker.io ps -a | grep -c "$testContainer")
 

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")
 
 if [ $res -ne 0 ]; then
-  #docker.io rmi $testImage
+  docker.io rmi $testImage
 fi

test/tools/end.sh

@@ -1,8 +1,15 @@
 #!/bin/sh
 
-dir=$(dirname $0)
+
-$dir/delete-container.sh > /dev/null 2>&1
+rm -rf $testDir
-$dir/delete-image.sh > /dev/null 2>&1
+./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

@@ -1,11 +1,11 @@
 #!/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 7
+sleep 10
 
 echo " --> Obtaining IP"
-IP=`docker inspect -f "{{ .NetworkSettings.IPAddress }}" $ID`
+IP=`docker.io inspect -f "{{ .NetworkSettings.IPAddress }}" $ID`
 if [ "$IP" = "" ]; then
 	abort "Unable to obtain container IP"
 	exit 1