Skip to content

Commit b68b62a

Browse files
author
Bertrand Gouny
committed
Merge branch 'release-0.9.0' into stable
2 parents 8e9be9c + 4ecd6c7 commit b68b62a

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
NAME = osixia/openldap
2-
VERSION = 0.8.0
2+
VERSION = 0.9.0
33

44
.PHONY: all build test tag_latest release
55

@@ -9,7 +9,7 @@ build:
99
docker.io build -t $(NAME):$(VERSION) --rm .
1010

1111
test:
12-
env NAME=$(NAME) VERSION=$(VERSION) ./test.sh
12+
env NAME=$(NAME) VERSION=$(VERSION) ./test.sh debug
1313

1414
tag_latest:
1515
docker.io tag $(NAME):$(VERSION) $(NAME):latest

test/tools/end.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#!/bin/sh
22

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

test/tools/prepare.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#!/bin/sh
22

3+
mkdir -p $testDir
4+
35
dir=$(dirname $0)
46
$dir/delete-container.sh
57
$dir/delete-image.sh

test/tools/run-container.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22

3-
echo "docker.io run --name $testContainer $runOptions -d $testImage"
4-
ID=`docker.io run --name $testContainer $runOptions -d $testImage`
3+
echo "docker.io run --name $testContainer $runOptions -d $testImage $runCommand"
4+
ID=`docker.io run --name $testContainer $runOptions -d $testImage $runCommand`
55
sleep 10
66

77
echo " --> Obtaining IP"

0 commit comments

Comments
 (0)