Merge branch 'hotfix-0.9.1' into stable

version
[twgit] Init hotfix 'hotfix-0.9.1'.
2014-07-17 10:37:55 +02:00 · 2014-07-17 10:37:49 +02:00 · 2014-07-17 10:25:10 +02:00 · 2014-07-16 22:48:37 +02:00 · 2014-07-16 22:33:31 +02:00 · 2014-07-16 22:32:44 +02:00
6 changed files with 10 additions and 6 deletions
@@ -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
@@ -1,5 +1,5 @@
 NAME = osixia/openldap
-VERSION = 0.8.0
+VERSION = 0.9.1

 .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
@@ -1,5 +1,7 @@
 #!/bin/sh

+
+rm -rf $testDir
 ./test/tools/delete-container.sh 
 ./test/tools/delete-image.sh > /dev/null 2>&1

@@ -1,5 +1,7 @@
 #!/bin/sh

+mkdir -p $testDir
+
 dir=$(dirname $0)
 $dir/delete-container.sh
 $dir/delete-image.sh
@@ -1,7 +1,7 @@
 #!/bin/sh

-echo "docker.io run --name $testContainer $runOptions -d $testImage"
-ID=`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 $runCommand`
 sleep 10

 echo " --> Obtaining IP"
Author	SHA1	Message	Date
Bertrand Gouny	7eae1e4547	Merge branch 'hotfix-0.9.1' into stable	2014-07-17 10:37:55 +02:00
Bertrand Gouny	17a6c73799	version	2014-07-17 10:37:49 +02:00
Bertrand Gouny	b7459175e1	[twgit] Init hotfix 'hotfix-0.9.1'.	2014-07-17 10:25:10 +02:00
Bertrand Gouny	b68b62a130	Merge branch 'release-0.9.0' into stable	2014-07-16 22:48:37 +02:00
Bertrand Gouny	4ecd6c7ba7	version	2014-07-16 22:33:31 +02:00
Bertrand Gouny	1546818b81	merge	2014-07-16 22:32:44 +02:00
Bertrand Gouny	6fd179601b	Merge branch 'feature-makefile' into release-0.9.0	2014-07-16 22:30:54 +02:00
Bertrand Gouny	13b7a0624e	[twgit] Init release 'release-0.9.0'.	2014-07-16 22:30:23 +02:00
Bertrand Gouny	fe18497e16	tests	2014-07-16 22:23:59 +02:00
osixia	8e9be9c75b	Rename LICENSE.txt to LICENSE	2014-07-02 17:19:55 +02:00
Bertrand Gouny	db173a2dc9	makefile	2014-06-24 17:55:39 +02:00
Bertrand Gouny	899389b581	[twgit] Init feature 'feature-makefile'.	2014-06-24 17:55:18 +02:00
Bertrand Gouny	62defdfd95	tests	2014-06-24 17:46:50 +02:00
Bertrand Gouny	a07ed80902	[twgit] Init feature 'feature-tests'.	2014-06-24 17:46:22 +02:00