diff --git a/.gitea/workflows/docker.yml b/.gitea/workflows/docker.yml index 0326171..437f199 100644 --- a/.gitea/workflows/docker.yml +++ b/.gitea/workflows/docker.yml @@ -120,7 +120,17 @@ jobs: if docker ps -a | grep -q ppanel-server; then echo "停止旧容器..." docker stop ppanel-server || true + echo "等待容器完全停止..." + sleep 3 + echo "删除旧容器..." docker rm ppanel-server || true + # 如果普通删除失败,尝试强制删除 + if docker ps -a | grep -q ppanel-server; then + echo "尝试强制删除容器..." + docker rm -f ppanel-server || true + fi + echo "等待删除操作完成..." + sleep 2 fi # 拉取最新镜像 @@ -129,10 +139,13 @@ jobs: # 启动新容器 echo "启动新容器..." + cd /root/vpn_server docker run -d \ --name ppanel-server \ --restart unless-stopped \ --network host \ + -v ./config/ppanel.yaml:/app/etc/ppanel.yaml \ + -v ./logs:/app/logs \ ${{ env.REPO }}:${{ env.VERSION }} # 检查容器状态