Merge branch 'release-0.9.0' into stable

This commit is contained in:
Bertrand Gouny committed 2014-07-16 22:48:37 +02:00
commit b68b62a130
4 files changed
+8 -4

No files matched your search

+2 -2
View File
@@ -1,5 +1,5 @@
NAME = osixia/openldap NAME = osixia/openldap
VERSION = 0.8.0 VERSION = 0.9.0
.PHONY: all build test tag_latest release .PHONY: all build test tag_latest release
@@ -9,7 +9,7 @@ build:
docker.io build -t $(NAME):$(VERSION) --rm . docker.io build -t $(NAME):$(VERSION) --rm .
test: test:
env NAME=$(NAME) VERSION=$(VERSION) ./test.sh env NAME=$(NAME) VERSION=$(VERSION) ./test.sh debug
tag_latest: tag_latest:
docker.io tag $(NAME):$(VERSION) $(NAME):latest docker.io tag $(NAME):$(VERSION) $(NAME):latest
+2
View File
@@ -1,5 +1,7 @@
#!/bin/sh #!/bin/sh
rm -rf $testDir
./test/tools/delete-container.sh ./test/tools/delete-container.sh
./test/tools/delete-image.sh > /dev/null 2>&1 ./test/tools/delete-image.sh > /dev/null 2>&1
+2
View File
@@ -1,5 +1,7 @@
#!/bin/sh #!/bin/sh
mkdir -p $testDir
dir=$(dirname $0) dir=$(dirname $0)
$dir/delete-container.sh $dir/delete-container.sh
$dir/delete-image.sh $dir/delete-image.sh
+2 -2
View File
@@ -1,7 +1,7 @@
#!/bin/sh #!/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 sleep 10
echo " --> Obtaining IP" echo " --> Obtaining IP"