From a07ed80902589134e98923a9d9c22f72449af4cf Mon Sep 17 00:00:00 2001 From: Bertrand Gouny Date: Tue, 24 Jun 2014 17:46:22 +0200 Subject: [PATCH 1/7] [twgit] Init feature 'feature-tests'. From 62defdfd9594bcd9b2037cd0f7c1e23aef3aeaa4 Mon Sep 17 00:00:00 2001 From: Bertrand Gouny Date: Tue, 24 Jun 2014 17:46:50 +0200 Subject: [PATCH 2/7] tests --- test/tools/end.sh | 2 ++ test/tools/prepare.sh | 2 ++ 2 files changed, 4 insertions(+) diff --git a/test/tools/end.sh b/test/tools/end.sh index b6af5d5..9373623 100755 --- a/test/tools/end.sh +++ b/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 diff --git a/test/tools/prepare.sh b/test/tools/prepare.sh index ea88ee1..6840d94 100755 --- a/test/tools/prepare.sh +++ b/test/tools/prepare.sh @@ -1,5 +1,7 @@ #!/bin/sh +mkdir -p $testDir + dir=$(dirname $0) $dir/delete-container.sh $dir/delete-image.sh From 899389b58139f628cfa9d532e6e2490a51afd1e2 Mon Sep 17 00:00:00 2001 From: Bertrand Gouny Date: Tue, 24 Jun 2014 17:55:18 +0200 Subject: [PATCH 3/7] [twgit] Init feature 'feature-makefile'. From db173a2dc929be75749823d06ac9a9a382bb951a Mon Sep 17 00:00:00 2001 From: Bertrand Gouny Date: Tue, 24 Jun 2014 17:55:39 +0200 Subject: [PATCH 4/7] makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 1db2a6c..362e786 100644 --- a/Makefile +++ b/Makefile @@ -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 From fe18497e16350a0e80f8a94ba470e50b3d51f740 Mon Sep 17 00:00:00 2001 From: Bertrand Gouny Date: Wed, 16 Jul 2014 22:23:59 +0200 Subject: [PATCH 5/7] tests --- Makefile | 2 +- test/tools/run-container.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 1db2a6c..4ce8630 100644 --- a/Makefile +++ b/Makefile @@ -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-repository.sh tag_latest: docker.io tag $(NAME):$(VERSION) $(NAME):latest diff --git a/test/tools/run-container.sh b/test/tools/run-container.sh index 3319e09..2c0e1d7 100755 --- a/test/tools/run-container.sh +++ b/test/tools/run-container.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" From 13b7a0624ee017c11b89039c04dff13c1a68a508 Mon Sep 17 00:00:00 2001 From: Bertrand Gouny Date: Wed, 16 Jul 2014 22:30:23 +0200 Subject: [PATCH 6/7] [twgit] Init release 'release-0.9.0'. From 4ecd6c7ba7276deb892a0fc4872bc30fb3372a3c Mon Sep 17 00:00:00 2001 From: Bertrand Gouny Date: Wed, 16 Jul 2014 22:33:31 +0200 Subject: [PATCH 7/7] version --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 362e786..5173b12 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ NAME = osixia/openldap -VERSION = 0.8.0 +VERSION = 0.9.0 .PHONY: all build test tag_latest release