From 111b94f9d85100cfb873246b15497e96d4574bde Mon Sep 17 00:00:00 2001
From: qxa <qxa@qwit.top>
Date: Thu, 18 Apr 2024 11:33:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=BB=98=E8=AE=A4=E5=90=AF?=
 =?UTF-8?q?=E5=8A=A8=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/push-dev.yaml                |  5 +++--
 .gitea/workflows/push-staging.yaml            |  5 +++--
 .../Dockerfile                                |  2 +-
 .../web.config                                | 20 -------------------
 docker-compose.yaml => docker-swarm.yaml      |  2 +-
 5 files changed, 8 insertions(+), 26 deletions(-)
 delete mode 100644 Dolphin.ExamPictureCut.HttpApi.Host/web.config
 rename docker-compose.yaml => docker-swarm.yaml (91%)

diff --git a/.gitea/workflows/push-dev.yaml b/.gitea/workflows/push-dev.yaml
index 084ef00..18e6d12 100644
--- a/.gitea/workflows/push-dev.yaml
+++ b/.gitea/workflows/push-dev.yaml
@@ -48,6 +48,7 @@ jobs:
             OWNER=${{ gitea.repository_owner }}
             TAG=${{ gitea.ref_name }}
             ASPNETCORE_ENVIRONMENT=${{ env.ASPNETCORE_ENVIRONMENT }}
+            replicas=1
         run: |
           echo "$env_file">.env
 
@@ -59,7 +60,7 @@ jobs:
           username: ${{ secrets.PUBLISH_USER_NAME }}
           password: ${{ secrets.PUBLISH_PASSWORD }}
           target: ${{ env.PUBLISH_PATH }}
-          source: docker-compose.yaml,.env
+          source: docker-swarm.yaml,.env
 
       - name: 部署到服务器
         uses: docker://appleboy/drone-ssh
@@ -74,7 +75,7 @@ jobs:
 
             [ -f .env ] && export $(sed '/^#/d' .env)
 
-            docker stack deploy -c docker-compose.yaml --with-registry-auth mk
+            docker stack deploy -c docker-swarm.yaml --with-registry-auth mk
 
       - name: 发送构建通知
         if: ${{ always() }}
diff --git a/.gitea/workflows/push-staging.yaml b/.gitea/workflows/push-staging.yaml
index 19c5179..5aa9e79 100644
--- a/.gitea/workflows/push-staging.yaml
+++ b/.gitea/workflows/push-staging.yaml
@@ -48,6 +48,7 @@ jobs:
             OWNER=${{ gitea.repository_owner }}
             TAG=${{ gitea.ref_name }}
             ASPNETCORE_ENVIRONMENT=${{ env.ASPNETCORE_ENVIRONMENT }}
+            replicas=8
         run: |
           echo "$env_file">.env
 
@@ -59,7 +60,7 @@ jobs:
           username: ${{ secrets.PUBLISH_USER_NAME }}
           password: ${{ secrets.PUBLISH_PASSWORD }}
           target: ${{ env.PUBLISH_PATH }}
-          source: docker-compose.yaml,.env
+          source: docker-swarm.yaml,.env
 
       - name: 部署到服务器
         uses: docker://appleboy/drone-ssh
@@ -74,7 +75,7 @@ jobs:
 
             [ -f .env ] && export $(sed '/^#/d' .env)
 
-            docker stack deploy -c docker-compose.yaml --with-registry-auth mk
+            docker stack deploy -c docker-swarm.yaml --with-registry-auth mk
 
       - name: 发送构建通知
         if: ${{ always() }}
diff --git a/Dolphin.ExamPictureCut.HttpApi.Host/Dockerfile b/Dolphin.ExamPictureCut.HttpApi.Host/Dockerfile
index 7e9c175..41d774d 100644
--- a/Dolphin.ExamPictureCut.HttpApi.Host/Dockerfile
+++ b/Dolphin.ExamPictureCut.HttpApi.Host/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/aspnet:8.0
+FROM dotnet/aspnet:8.0
 
 ENV TZ=Asia/Shanghai \
     DEBIAN_FRONTEND=noninteractive
diff --git a/Dolphin.ExamPictureCut.HttpApi.Host/web.config b/Dolphin.ExamPictureCut.HttpApi.Host/web.config
deleted file mode 100644
index 050e7f2..0000000
--- a/Dolphin.ExamPictureCut.HttpApi.Host/web.config
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <location path="." inheritInChildApplications="false">
-    <system.webServer>
-      <handlers>
-        <add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModuleV2" resourceType="Unspecified" />
-      </handlers>
-      <aspNetCore processPath="dotnet" arguments=".\Dolphin.ExamPictureCut.HttpApi.Host.dll" stdoutLogEnabled="false" stdoutLogFile=".\Logs\stdout" hostingModel="inprocess" />
-    </system.webServer>
-  </location>
-  <system.webServer>
-    <httpProtocol>
-      <customHeaders>
-        <remove name="x-powered-by" />
-      </customHeaders>
-    </httpProtocol>
-  </system.webServer>
-</configuration>
-
-
diff --git a/docker-compose.yaml b/docker-swarm.yaml
similarity index 91%
rename from docker-compose.yaml
rename to docker-swarm.yaml
index 8b74a02..40cd337 100644
--- a/docker-compose.yaml
+++ b/docker-swarm.yaml
@@ -12,4 +12,4 @@ services:
     #   - 9925:80
     deploy:
       mode: replicated
-      replicas: 1
+      replicas: ${replicas:-1}