소스 검색

Merge branch 'hotfix-1.0.7' into stable

ofreax 10 년 전
부모
커밋
a8dc78c5f4
8개의 변경된 파일5개의 추가작업 그리고 2개의 파일을 삭제
  1. 3 0
      CHANGELOG.md
  2. 1 1
      Makefile
  3. 1 1
      image/service/slapd/container-start.sh
  4. BIN
      test/database/__db.001
  5. BIN
      test/database/__db.002
  6. BIN
      test/database/__db.003
  7. BIN
      test/database/alock
  8. BIN
      test/database/log.0000000001

+ 3 - 0
CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 1.0.7
+  - Fix startup bug
+
 ## 1.0.6
   - Use light-baseimage:0.1.5
 

+ 1 - 1
Makefile

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

+ 1 - 1
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

BIN
test/database/__db.001


BIN
test/database/__db.002


BIN
test/database/__db.003


BIN
test/database/alock


BIN
test/database/log.0000000001