Browse Source

fix: wait pg ready

xiaobing.wang 1 year ago
parent
commit
fa642c12c9
3 changed files with 6 additions and 1 deletions
  1. 2 0
      release/latest/compose.yaml
  2. 1 0
      release/latest/setup.sh
  3. 3 1
      release/latest/upgrade.sh

+ 2 - 0
release/latest/compose.yaml

@@ -25,6 +25,8 @@ services:
       safeline-ce:
         ipv4_address: ${SUBNET_PREFIX}.2
     command: [postgres, -c, max_connections=200]
+    healthcheck:
+      test: pg_isready -U safeline-ce -d safeline-ce
   mgt:
     container_name: safeline-mgt
     restart: always

+ 1 - 0
release/latest/setup.sh

@@ -250,6 +250,7 @@ fi
 
 qrcode
 
+check_container_health safeline-pg
 check_container_health safeline-mgt
 docker exec safeline-mgt /app/mgt-cli reset-admin --once
 

+ 3 - 1
release/latest/upgrade.sh

@@ -268,12 +268,14 @@ $compose_command down --remove-orphans && $compose_command up -d
 if [ $? -ne "0" ]; then
     abort "替换 Docker 容器失败"
 fi
-info "雷池升级成功"
 
 qrcode
 
+check_container_health safeline-pg
 check_container_health safeline-mgt
 docker exec safeline-mgt /app/mgt-cli reset-admin --once
 
+info "雷池升级成功"
+
 warning "雷池 WAF 社区版安装成功, 请访问以下地址访问控制台"
 warning "https://0.0.0.0:9443/"