Skip to content

Commit a8dc78c

Browse files
committed
Merge branch 'hotfix-1.0.7' into stable
2 parents 49cdb5d + 696974a commit a8dc78c

File tree

8 files changed

+5
-2
lines changed

8 files changed

+5
-2
lines changed

β€ŽCHANGELOG.mdβ€Ž

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Changelog
22

3+
##Β 1.0.7
4+
- Fix startup bug
5+
36
##Β 1.0.6
47
- Use light-baseimage:0.1.5
58

β€ŽMakefileβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
NAME = osixia/openldap
2-
VERSION = 1.0.6
2+
VERSION = 1.0.7
33

44
.PHONY: all build test tag_latest release
55

β€Žimage/service/slapd/container-start.shβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ EOF
281281
# stop OpenLDAP
282282
SLAPD_PID=$(cat /run/slapd/slapd.pid)
283283
echo "Kill slapd, pid: $SLAPD_PID"
284-
kill $SLAPD_PID
284+
kill -9 $SLAPD_PID
285285
echo "[ok]"
286286

287287
sleep 3

β€Žtest/database/__db.001β€Ž

0 Bytes
Binary file not shown.

β€Žtest/database/__db.002β€Ž

0 Bytes
Binary file not shown.

β€Žtest/database/__db.003β€Ž

0 Bytes
Binary file not shown.

β€Žtest/database/alockβ€Ž

0 Bytes
Binary file not shown.

β€Žtest/database/log.0000000001β€Ž

0 Bytes
Binary file not shown.

0 commit comments

Comments
Β (0)