From b9b0dc3bdaeb04b469cef435b5ad7e8147342f09 Mon Sep 17 00:00:00 2001
From: shanshanzhong <shanshanzhong147@gmail.com>
Date: Fri, 26 Sep 2025 18:57:19 -0700
Subject: [PATCH] x

---
 .gitea/workflows/docker.yml | 33 ++++++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/.gitea/workflows/docker.yml b/.gitea/workflows/docker.yml
index 5ffacdf..a2631bb 100644
--- a/.gitea/workflows/docker.yml
+++ b/.gitea/workflows/docker.yml
@@ -20,6 +20,12 @@ env:
   # TG通知
   TG_BOT_TOKEN: 8114337882:AAHkEx03HSu7RxN4IHBJJEnsK9aPPzNLIk0
   TG_CHAT_ID: "-4940243803"
+  # Go构建变量
+  SERVICE: ppanel
+  SERVICE_STYLE: ppanel
+  VERSION: ${{ github.sha }}
+  BUILDTIME: ${{ github.event.head_commit.timestamp }}
+  GOARCH: amd64
 
 jobs:
   build:
@@ -35,20 +41,29 @@ jobs:
       - name: 📥 下载代码
         uses: actions/checkout@v4
         
-      # 步骤2: 打包编译 (执行dockerfile编译 + make build)
+      # 步骤2: 打包编译 (直接使用Go构建)
       - name: 🔨 打包编译
         run: |
-          echo "开始编译..."
-          make build
-          echo "编译完成，开始构建Docker镜像..."
-          make docker
+          echo "开始Go编译..."
+          echo "版本: ${{ env.VERSION }}"
+          echo "构建时间: ${{ env.BUILDTIME }}"
+          
+          echo "开始构建Docker镜像..."
+          
+          # 构建Docker镜像
+          docker build -f Dockerfile -t ${{ env.REPO }}:${{ env.VERSION }} .
+          
           echo "Docker镜像构建完成"
           
       # 步骤3: 发布到镜像仓库
       - name: 📤 发布到镜像仓库
         run: |
           echo "开始推送镜像到仓库..."
-          make publish-docker
+          echo "推送镜像: ${{ env.REPO }}:${{ env.VERSION }}"
+          
+          # 直接推送Docker镜像
+          docker push ${{ env.REPO }}:${{ env.VERSION }}
+          
           echo "镜像推送完成"
           
       # 步骤4: 连接服务器拉镜像启动
@@ -72,8 +87,8 @@ jobs:
             fi
             
             # 拉取最新镜像
-            echo "拉取最新镜像..."
-            docker pull ${{ env.REPO }}:latest
+            echo "拉取镜像版本: ${{ env.VERSION }}..."
+            docker pull ${{ env.REPO }}:${{ env.VERSION }}
             
             # 启动新容器
             echo "启动新容器..."
@@ -81,7 +96,7 @@ jobs:
               --name ppanel-server \
               --restart unless-stopped \
               -p 8080:8080 \
-              ${{ env.REPO }}:latest
+              ${{ env.REPO }}:${{ env.VERSION }}
               
             # 检查容器状态
             sleep 5