From 18813f905a10708dfb0b3cb0e799dde0507da4ca Mon Sep 17 00:00:00 2001
From: movingsam <samsu9149@163.com>
Date: Sun, 1 Mar 2026 13:42:03 +0800
Subject: [PATCH] =?UTF-8?q?fix(ci):=20=E4=BF=AE=E6=AD=A3=20Docker=20?=
 =?UTF-8?q?=E6=9E=84=E5=BB=BA=E9=85=8D=E7=BD=AE=E5=92=8C=20Dockerfile=20?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修正 docker.yml 中 dockerfile 参数为 file 以匹配 action 版本要求
- 优化 Dockerfile，调整项目文件拷贝路径及恢复依赖步骤
- 统一工作目录路径，确保构建命令正确执行
- 删除多余的复制和恢复步骤，简化构建流程
---
 .gitea/workflows/docker.yml |  2 +-
 src/Dockerfile              | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.gitea/workflows/docker.yml b/.gitea/workflows/docker.yml
index 69c986e..52c4cae 100644
--- a/.gitea/workflows/docker.yml
+++ b/.gitea/workflows/docker.yml
@@ -50,7 +50,7 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
-          dockerfile: src/Dockerfile
+          file: src/Dockerfile
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
diff --git a/src/Dockerfile b/src/Dockerfile
index c3679c9..ed2a5ef 100644
--- a/src/Dockerfile
+++ b/src/Dockerfile
@@ -7,17 +7,17 @@ FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build
 ARG BUILD_CONFIGURATION=Release
 WORKDIR /src
 
-COPY ["fengling-console/src/Fengling.Console.csproj", "fengling-console/"]
-COPY ["fengling-gateway/src/YarpGateway.csproj", "fengling-gateway/"]
-COPY ["fengling-platform/Fengling.Platform.Infrastructure/Fengling.Platform.Infrastructure.csproj", "fengling-platform/Fengling.Platform.Infrastructure/"]
-COPY ["fengling-platform/Fengling.Platform.Domain/Fengling.Platform.Domain.csproj", "fengling-platform/Fengling.Platform.Domain/"]
-COPY ["fengling-service-discovery/Fengling.ServiceDiscovery.Core/Fengling.ServiceDiscovery.Core.csproj", "fengling-service-discovery/Fengling.ServiceDiscovery.Core/"]
-COPY ["fengling-service-discovery/Fengling.ServiceDiscovery.Kubernetes/Fengling.ServiceDiscovery.Kubernetes.csproj", "fengling-service-discovery/Fengling.ServiceDiscovery.Kubernetes/"]
-COPY ["fengling-service-discovery/Fengling.ServiceDiscovery.Static/Fengling.ServiceDiscovery.Static.csproj", "fengling-service-discovery/Fengling.ServiceDiscovery.Static/"]
+# Copy Directory.Build.props and Directory.Packages.props for central package management
+COPY ["Directory.Build.props", "./"]
+COPY ["Directory.Packages.props", "./"]
 
-RUN dotnet restore "fengling-console/Fengling.Console.csproj"
+# Copy project file and restore dependencies
+COPY ["src/Fengling.Console.csproj", "src/"]
+RUN dotnet restore "src/Fengling.Console.csproj"
+
+# Copy source code and build
 COPY . .
-WORKDIR "/src/fengling-console"
+WORKDIR "/src/src"
 RUN dotnet build "./Fengling.Console.csproj" -c $BUILD_CONFIGURATION -o /app/build
 
 FROM build AS publish
@@ -26,4 +26,4 @@ RUN dotnet publish "./Fengling.Console.csproj" -c $BUILD_CONFIGURATION -o /app/p
 FROM base AS final
 WORKDIR /app
 COPY --from=publish /app/publish .
-ENTRYPOINT ["dotnet", "Fengling.Console.dll"]
+ENTRYPOINT ["dotnet", "Fengling.Console.dll"]
\ No newline at end of file