Merge branch 'hotfix-1.0.7' into stable

osixia · Nov 20, 2015 · a8dc78c · a8dc78c
2 parents 49cdb5d + 696974a
commit a8dc78c
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 1.0.7
+  - Fix startup bug
+
 ## 1.0.6
   - Use light-baseimage:0.1.5
 

diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 NAME = osixia/openldap
-VERSION = 1.0.6
+VERSION = 1.0.7
 
 .PHONY: all build test tag_latest release
 

diff --git a/image/service/slapd/container-start.sh b/image/service/slapd/container-start.sh
@@ -281,7 +281,7 @@ EOF
   # stop OpenLDAP
   SLAPD_PID=$(cat /run/slapd/slapd.pid)
   echo "Kill slapd, pid: $SLAPD_PID"
-  kill $SLAPD_PID
+  kill -9 $SLAPD_PID
   echo "[ok]"
 
   sleep 3

diff --git a/test/database/__db.001 b/test/database/__db.001
diff --git a/test/database/__db.002 b/test/database/__db.002
diff --git a/test/database/__db.003 b/test/database/__db.003
diff --git a/test/database/alock b/test/database/alock
diff --git a/test/database/log.0000000001 b/test/database/log.0000000001