浏览代码

Merge branch 'release-0.9.0' into stable

Bertrand Gouny 11 年之前
父节点
当前提交
b68b62a130
共有 4 个文件被更改,包括 8 次插入4 次删除
  1. 2 2
      Makefile
  2. 2 0
      test/tools/end.sh
  3. 2 0
      test/tools/prepare.sh
  4. 2 2
      test/tools/run-container.sh

+ 2 - 2
Makefile

@@ -1,5 +1,5 @@
 NAME = osixia/openldap
-VERSION = 0.8.0
+VERSION = 0.9.0
 
 .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

+ 2 - 0
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
 

+ 2 - 0
test/tools/prepare.sh

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

+ 2 - 2
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"