334

.gitea/workflows/build.yml

@@ -38,11 +38,6 @@ jobs:
         run: |
           sed -i "s|{{IMAGE_TAG}}|${{ github.sha }}|g" app-product.yml
 
-          # 验证替换结果（可选，用于调试）
-          echo "替换后的 app-product.yml 内容："
-          cat app-product.yml
-          echo ""
-
       - name: 上传 app-product.yml 到前端集群管理机
         uses: appleboy/scp-action@v1
         with:

docker-compose.yml

@@ -1,43 +1,37 @@
-# version: '3.8'
+version: '3.8'
 
+services:
+  gitea-actions-runner:
+    image: gitea/act_runner:latest
+    container_name: gitea-act-runner
+    restart: unless-stopped
+    volumes:
+      - runner-data:/data
+      - /var/run/docker.sock:/var/run/docker.sock
+    environment:
+      - GITEA_INSTANCE_URL=https://git.bmycode.help
+      - GITEA_RUNNER_REGISTRATION_TOKEN=WFiO5JDwz7CHnk7fMGJYMcSITU81CLXuI7Ofg10e
+      - GITEA_RUNNER_LABELS=ubuntu-latest:docker://docker.gitea.com/runner-images:ubuntu-latest
+
+volumes:
+  runner-data:
+
+    # version: "3.8"
     # services:
-#   gitea-actions-runner:
+    #   runner:
     #     image: gitea/act_runner:latest
     #     container_name: gitea-act-runner
     #     restart: unless-stopped
+    #     environment:
+    #       CONFIG_FILE: /config.yaml
+    #       GITEA_INSTANCE_URL: https://git.bmycode.help
+    #       GITEA_RUNNER_REGISTRATION_TOKEN: WFiO5JDwz7CHnk7fMGJYMcSITU81CLXuI7Ofg10e
     #     volumes:
+    #       - ./config.yaml:/config.yaml
     #       - runner-data:/data
     #       - /var/run/docker.sock:/var/run/docker.sock
-#     working_dir: /data # 关键：设置工作目录为卷挂载点  
-#     environment:
-#       - GITEA_INSTANCE_URL=https://git.bmycode.help
-#       - GITEA_RUNNER_REGISTRATION_TOKEN=WFiO5JDwz7CHnk7fMGJYMcSITU81CLXuI7Ofg10e
-#       - GITEA_RUNNER_LABELS=ubuntu-latest:docker://node:20-bullseye
-#       - GITEA_RUNNER_NAME=my-vue-app-runner
-#     networks:
-#       - gitea-actions-network
 
     # volumes:
     #   runner-data:
 
-# networks:
-#   gitea-actions-network:
-#     driver: bridge
 
-version: "3.8"
-services:
-  runner:
-    image: gitea/act_runner:latest
-    container_name: gitea-act-runner
-    restart: unless-stopped
-    environment:
-      CONFIG_FILE: /config.yaml
-      GITEA_INSTANCE_URL: https://git.bmycode.help
-      GITEA_RUNNER_REGISTRATION_TOKEN: WFiO5JDwz7CHnk7fMGJYMcSITU81CLXuI7Ofg10e
-    volumes:
-      - ./config.yaml:/config.yaml
-      - runner-data:/data
-      - /var/run/docker.sock:/var/run/docker.sock
-
-volumes:
-  runner-data: