修改容器启动逻辑

This commit is contained in:
hanhh
2021-06-16 21:27:21 +08:00
parent e217ca6d8f
commit 3232f1efa4
2 changed files with 9 additions and 16 deletions
+5 -8
View File
@@ -251,7 +251,6 @@ usage() {
## 更新qinglong
update_qinglong() {
local no_restart="$1"
echo -e "--------------------------------------------------------------\n"
[ -f $dir_root/package.json ] && ql_depend_old=$(cat $dir_root/package.json)
reset_romote_url ${dir_root} "${github_proxy_url}https://github.com/whyour/qinglong.git"
@@ -288,12 +287,10 @@ update_qinglong() {
cd $dir_root
rm -rf $dir_root/build && rm -rf $dir_root/dist
cp -rf $ql_static_repo/* $dir_root
if [[ $no_restart != "no-restart" ]]; then
echo -e "重启面板中..."
nginx -s reload 2>/dev/null || nginx -c /etc/nginx/nginx.conf
sleep 1
reload_pm2
fi
echo -e "重启面板中..."
nginx -s reload 2>/dev/null || nginx -c /etc/nginx/nginx.conf
sleep 1
reload_pm2
else
echo -e "\n更新$dir_root失败,请检查原因...\n"
fi
@@ -403,7 +400,7 @@ main() {
log_path="$dir_log/update/${log_time}_$p1.log"
case $p1 in
update)
update_qinglong "$2" | tee $log_path
update_qinglong | tee $log_path
;;
extra)
run_extra_shell | tee -a $log_path