diff --git a/.gitea/workflows/docker.yml b/.gitea/workflows/docker.yml index 330a036..4d5a703 100644 --- a/.gitea/workflows/docker.yml +++ b/.gitea/workflows/docker.yml @@ -24,7 +24,7 @@ env: SSH_HOST: ${{ github.ref_name == 'main' && vars.PRO_SSH_HOST || (github.ref_name == 'develop' && vars.DEV_SSH_HOST || vars.PRO_SSH_HOST) }} SSH_PORT: ${{ github.ref_name == 'main' && vars.PRO_SSH_PORT || (github.ref_name == 'develop' && vars.DEV_SSH_PORT || vars.PRO_SSH_PORT) }} SSH_USER: ${{ github.ref_name == 'main' && vars.PRO_SSH_USER || (github.ref_name == 'dedevelopv' && vars.DEV_SSH_USER || vars.PRO_SSH_USER) }} - SSH_PASSWORD: ${{ github.ref_name == 'main' && vars.PRO_SSH_PASSWORD || (github.ref_name == 'develop' && vars.DEV_SSH_PASSWORD || vars.PRO_SSH_PASSWORD) }} + SSH_PASSWORD: ${{ github.ref_name == 'main' && vars.PRO_SSH_PASSWORD || (github.ref_name == 'dedevelopv' && vars.DEV_SSH_PASSWORD || vars.PRO_SSH_PASSWORD) }} jobs: build: @@ -418,15 +418,15 @@ jobs: echo "使用docker buildx进行优化构建" docker buildx build \ --platform linux/amd64 \ - --cache-from type=registry,ref=${{ env.DOCKER_REGISTRY }}/ppanel/ppanel-user-web:cache \ - --cache-to type=registry,ref=${{ env.DOCKER_REGISTRY }}/ppanel/ppanel-user-web:cache,mode=max \ + --cache-from type=registry,ref=${{ env.DOCKER_REGISTRY }}/ppanel/fastvpn-user-web:cache \ + --cache-to type=registry,ref=${{ env.DOCKER_REGISTRY }}/ppanel/fastvpn-user-web:cache,mode=max \ -f ./docker/ppanel-user-web/Dockerfile \ - -t ${{ env.DOCKER_REGISTRY }}/ppanel/ppanel-user-web:${{ env.VERSION }} \ + -t ${{ env.DOCKER_REGISTRY }}/ppanel/fastvpn-user-web:${{ env.VERSION }} \ --push . else echo "使用常规docker构建" - docker build -f ./docker/ppanel-user-web/Dockerfile -t ${{ env.DOCKER_REGISTRY }}/ppanel/ppanel-user-web:${{ env.VERSION }} . - docker push ${{ env.DOCKER_REGISTRY }}/ppanel/ppanel-user-web:${{ env.VERSION }} + docker build -f ./docker/ppanel-user-web/Dockerfile -t ${{ env.DOCKER_REGISTRY }}/ppanel/fastvpn-user-web:${{ env.VERSION }} . + docker push ${{ env.DOCKER_REGISTRY }}/ppanel/fastvpn-user-web:${{ env.VERSION }} fi - name: SSH连接预检查 @@ -491,8 +491,8 @@ jobs: # 拉取镜像(带重试) echo "拉取Docker镜像..." for i in {1..3}; do - echo "尝试拉取镜像 ($i/3): ${{ env.DOCKER_REGISTRY }}/ppanel/ppanel-admin-web:${{ env.VERSION }}" - if docker pull ${{ env.DOCKER_REGISTRY }}/ppanel/ppanel-admin-web:${{ env.VERSION }}; then + echo "尝试拉取镜像 ($i/3): ${{ env.DOCKER_REGISTRY }}/ppanel/fastvpn-admin-web:${{ env.VERSION }}" + if docker pull ${{ env.DOCKER_REGISTRY }}/ppanel/fastvpn-admin-web:${{ env.VERSION }}; then echo "✅ 镜像拉取成功" break else @@ -575,18 +575,18 @@ jobs: echo "启动新容器..." docker run -d \ --add-host api.airoport.co:103.150.215.40 \ - --name ppanel-admin-web \ + --name fastvpn-admin-web \ --restart unless-stopped \ -p 3001:3000 \ -e NEXT_PUBLIC_API_URL=${{ env.NEXT_PUBLIC_API_URL }} \ - ${{ env.DOCKER_REGISTRY }}/ppanel/ppanel-admin-web:${{ env.VERSION }} + ${{ env.DOCKER_REGISTRY }}/ppanel/fastvpn-admin-web:${{ env.VERSION }} # 验证容器启动 echo "验证容器启动状态..." for i in {1..10}; do - if docker ps -q -f name=ppanel-admin-web | grep -q .; then + if docker ps -q -f name=fastvpn-admin-web | grep -q .; then echo "✅ 管理面板部署成功" - docker ps -f name=ppanel-admin-web --format "table {{.Names}}\t{{.Status}}\t{{.Ports}}" + docker ps -f name=fastvpn-admin-web --format "table {{.Names}}\t{{.Status}}\t{{.Ports}}" exit 0 else echo "等待容器启动... $i/10" @@ -595,7 +595,7 @@ jobs: done echo "❌ 管理面板部署失败 - 容器未能正常启动" - docker logs ppanel-admin-web || true + docker logs fastvpn-admin-web || true exit 1 - name: 部署用户面板到服务器 @@ -725,18 +725,18 @@ jobs: echo "启动新容器..." docker run -d \ --add-host api.airoport.co:103.150.215.40 \ - --name ppanel-user-web \ + --name fastvpn-user-web \ --restart unless-stopped \ -p 3002:3000 \ -e NEXT_PUBLIC_API_URL=${{ env.NEXT_PUBLIC_API_URL }} \ - ${{ env.DOCKER_REGISTRY }}/ppanel/ppanel-user-web:${{ env.VERSION }} + ${{ env.DOCKER_REGISTRY }}/ppanel/fastvpn-user-web:${{ env.VERSION }} # 验证容器启动 echo "验证容器启动状态..." for i in {1..10}; do - if docker ps -q -f name=ppanel-user-web | grep -q .; then + if docker ps -q -f name=fastvpn-user-web | grep -q .; then echo "✅ 用户面板部署成功" - docker ps -f name=ppanel-user-web --format "table {{.Names}}\t{{.Status}}\t{{.Ports}}" + docker ps -f name=fastvpn-user-web --format "table {{.Names}}\t{{.Status}}\t{{.Ports}}" exit 0 else echo "等待容器启动... $i/10" @@ -745,10 +745,10 @@ jobs: done echo "❌ 用户面板部署失败 - 容器未能正常启动" - docker logs ppanel-user-web || true + docker logs fastvpn-user-web || true exit 1 - # 步骤5: TG通知 (成功) + # 步骤5: TG通知 (成功) - name: 📱 发送成功通知到Telegram if: success() uses: appleboy/telegram-action@master