From 2c9b9cd223348486468f29e68c21d4e296395df6 Mon Sep 17 00:00:00 2001
From: huangzhiqiang <huangzhiqiang@roarpanda.com>
Date: Sat, 7 Jun 2025 16:32:12 +0800
Subject: [PATCH] update action

---
 .gitea/workflows/build-ubuntu.yaml | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/.gitea/workflows/build-ubuntu.yaml b/.gitea/workflows/build-ubuntu.yaml
index f0317bf..0051a69 100644
--- a/.gitea/workflows/build-ubuntu.yaml
+++ b/.gitea/workflows/build-ubuntu.yaml
@@ -95,15 +95,21 @@ jobs:
           
           echo "等待服务启动..."
           sleep 2
-          
           echo "检查 NGINX 进程..."
           ps aux | grep nginx
-            echo "测试 HTTP 连接..."
+          
+          echo "测试 HTTP 连接..."
           curl -v localhost || echo "HTTP 测试失败，但继续执行"
           
           echo "停止 NGINX..."
           sudo /usr/local/nginx/sbin/nginx -s quit
 
+      - name: 准备 Docker 构建上下文
+        run: |
+          echo "复制 nginx 文件到构建上下文..."
+          sudo cp -r /usr/local/nginx ./nginx-install
+          sudo chown -R $(whoami):$(whoami) ./nginx-install
+
       - name: 创建 Dockerfile
         run: |
           cat > Dockerfile << 'EOF'
@@ -118,12 +124,13 @@ jobs:
                 libxslt1.1 \
                 libgd3 \
                 libgeoip1 \
-                libxml2 && \
+                libxml2 \
+                curl && \
               apt-get clean && \
               rm -rf /var/lib/apt/lists/*
           
           # 复制编译好的 nginx
-          COPY /usr/local/nginx /usr/local/nginx
+          COPY nginx-install /usr/local/nginx
           
           # 创建 nginx 用户
           RUN useradd --system --home /var/cache/nginx --shell /sbin/nologin --comment "nginx user" --user-group nginx
@@ -138,8 +145,7 @@ jobs:
           # 健康检查
           HEALTHCHECK --interval=30s --timeout=3s --start-period=5s --retries=3 \
             CMD curl -f http://localhost/ || exit 1
-          
-          # 启动 nginx
+            # 启动 nginx
           CMD ["/usr/local/nginx/sbin/nginx", "-g", "daemon off;"]
           EOF
 
@@ -157,7 +163,7 @@ jobs:
         run: |
           echo "标记镜像..."
           docker tag nginx-local:latest ${{ secrets.HARBOR_REGISTRY }}/test/nginx:${{ github.sha }}
-          docker tag nginx-local:d'datest ${{ secrets.HARBOR_REGISTRY }}/test/nginx:latest
+          docker tag nginx-local:latest ${{ secrets.HARBOR_REGISTRY }}/test/nginx:latest
           
           echo "推送镜像..."
           docker push ${{ secrets.HARBOR_REGISTRY }}/test/nginx:${{ github.sha }}