From 8e3ce4d6ee382201600bd352d94f3c2d6c38b02f Mon Sep 17 00:00:00 2001 From: gewuyou Date: Sun, 11 May 2025 12:28:08 +0800 Subject: [PATCH] =?UTF-8?q?ci(deploy):=20=E6=9B=B4=E6=96=B0=E9=83=A8?= =?UTF-8?q?=E7=BD=B2=E5=B7=A5=E4=BD=9C=E6=B5=81=E5=B9=B6=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E7=AB=AF=E5=8F=A3=E6=98=A0=E5=B0=84?= =?UTF-8?q?-=20=E7=A7=BB=E9=99=A4=20deploy.master.yml=20=E4=B8=AD=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD=E5=92=8C=E4=BD=BF=E7=94=A8=20drone-scp=20=E7=9A=84?= =?UTF-8?q?=E6=AD=A5=E9=AA=A4=20-=20=E6=9B=B4=E6=96=B0=20docker-compose.ma?= =?UTF-8?q?ster.main.yml=20=E4=B8=AD=E6=95=B0=E6=8D=AE=E5=BA=93=E5=AE=B9?= =?UTF-8?q?=E5=99=A8=E7=9A=84=E7=AB=AF=E5=8F=A3=E6=98=A0=E5=B0=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/deploy.master.yml | 9 --------- docker/docker-compose.master.main.yml | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/.gitea/workflows/deploy.master.yml b/.gitea/workflows/deploy.master.yml index fc21365..0a84d08 100644 --- a/.gitea/workflows/deploy.master.yml +++ b/.gitea/workflows/deploy.master.yml @@ -76,15 +76,8 @@ jobs: uses: ${{env.JCNC_GITEA_URL}}/gradle/actions/setup-gradle@v4 with: gradle-version: wrapper # 使用项目自带的gradle-wrapper - - name: 🔽 Download drone-scp - run: | - curl -L "https://github.moeyy.xyz/https://github.com/appleboy/drone-scp/releases/download/v1.8.0/drone-scp-1.8.0-linux-amd64" \ - -o drone-scp - chmod +x drone-scp - name: 📦 Copy Compose File to Internal Server uses: ${{env.JCNC_GITEA_URL}}/appleboy/scp-action@v1 - env: - DRONE_SCP_BINARY: ./drone-scp with: host: ${{ env.INTERNAL_SERVER_HOST }} port: $INTERNAL_SERVER_PROT @@ -94,8 +87,6 @@ jobs: target: "/home/luke/deploy/llmx/" - name: 📦 Copy Compose File to Singapore Server uses: ${{env.JCNC_GITEA_URL}}/appleboy/scp-action@v1 - env: - DRONE_SCP_BINARY: ./drone-scp with: host: $SINGAPORE_SERVER_HOST port: $SSH_PROT diff --git a/docker/docker-compose.master.main.yml b/docker/docker-compose.master.main.yml index 0d61505..5bce838 100644 --- a/docker/docker-compose.master.main.yml +++ b/docker/docker-compose.master.main.yml @@ -16,7 +16,7 @@ services: container_name: llmx-database restart: always ports: - - "9052:5432" + - "5432:5432" networks: - llmx-net-master environment: