diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index c94539b..f723d54 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -27,7 +27,7 @@ jobs: # Job 1: 设置环境变量,供后续 jobs 共享 # ============================================================ prepare: - runs-on: ario-server + runs-on: zero-ppanel-server outputs: docker_tag: ${{ steps.vars.outputs.docker_tag }} container_suffix: ${{ steps.vars.outputs.container_suffix }} @@ -58,7 +58,7 @@ jobs: # Job 2: 并行矩阵构建 5 个服务镜像 # ============================================================ build: - runs-on: ario-server + runs-on: zero-ppanel-server needs: prepare strategy: fail-fast: false @@ -66,19 +66,19 @@ jobs: service: - name: api dockerfile: deploy/Dockerfile.api - image_name: ppanel-api + image_name: zero-ppanel-api - name: admin dockerfile: deploy/Dockerfile.admin - image_name: ppanel-admin + image_name: zero-ppanel-admin - name: node dockerfile: deploy/Dockerfile.node - image_name: ppanel-node + image_name: zero-ppanel-node - name: queue dockerfile: deploy/Dockerfile.queue - image_name: ppanel-queue + image_name: zero-ppanel-queue - name: scheduler dockerfile: deploy/Dockerfile.scheduler - image_name: ppanel-scheduler + image_name: zero-ppanel-scheduler steps: - name: 📥 下载代码 diff --git a/apps/admin/internal/handler/routes.go b/apps/admin/internal/handler/routes.go index 2e5d3f4..5d0c158 100644 --- a/apps/admin/internal/handler/routes.go +++ b/apps/admin/internal/handler/routes.go @@ -10,7 +10,7 @@ import ( common "github.com/zero-ppanel/zero-ppanel/apps/admin/internal/handler/common" console "github.com/zero-ppanel/zero-ppanel/apps/admin/internal/handler/console" order "github.com/zero-ppanel/zero-ppanel/apps/admin/internal/handler/order" - server serverhandler "github.com/zero-ppanel/zero-ppanel/apps/admin/internal/handler/server" + serverhandler "github.com/zero-ppanel/zero-ppanel/apps/admin/internal/handler/server" subscribe "github.com/zero-ppanel/zero-ppanel/apps/admin/internal/handler/subscribe" system "github.com/zero-ppanel/zero-ppanel/apps/admin/internal/handler/system" ticket "github.com/zero-ppanel/zero-ppanel/apps/admin/internal/handler/ticket" diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml index 066d753..939dfed 100644 --- a/deploy/docker-compose.yml +++ b/deploy/docker-compose.yml @@ -2,9 +2,7 @@ version: '3.8' services: ppanel-api: - build: - context: .. - dockerfile: deploy/Dockerfile.api + image: "${REPO}/api:latest" ports: - "8080:8080" - "6160:6160" @@ -16,9 +14,7 @@ services: - ../apps/api/etc:/app/etc ppanel-admin: - build: - context: .. - dockerfile: deploy/Dockerfile.admin + image: "${REPO}/admin:latest" ports: - "8081:8081" - "6161:6161" @@ -30,9 +26,7 @@ services: - ../apps/admin/etc:/app/etc ppanel-node: - build: - context: .. - dockerfile: deploy/Dockerfile.node + image: "${REPO}/node:latest" ports: - "8082:8082" - "6162:6162" @@ -46,9 +40,7 @@ services: replicas: 2 ppanel-queue: - build: - context: .. - dockerfile: deploy/Dockerfile.queue + image: "${REPO}/queue:latest" depends_on: - mysql - redis @@ -57,9 +49,7 @@ services: - ../apps/queue/etc:/app/etc ppanel-scheduler: - build: - context: .. - dockerfile: deploy/Dockerfile.scheduler + image: "${REPO}/scheduler:latest" depends_on: - mysql - redis