From 2cd8b73aa3d25ea50d12cf4a52462cdc5c62b8d0 Mon Sep 17 00:00:00 2001
From: "fengxian.guo" <fenngmr@outlook.com>
Date: Sat, 21 Dec 2024 08:37:10 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20docker=20=E6=9E=84=E5=BB=BA=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=E9=97=AE=E9=A2=98=E8=A7=A3=E5=86=B3=EF=BC=8C=E5=8F=8A?=
 =?UTF-8?q?docker=E6=9E=84=E5=BB=BA=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Yi.Abp.Net8/src/Yi.Abp.Web/Dockerfile         |  2 ++
 .../src/Yi.Abp.Web/README-DOCKER-BUILD.md     | 22 +++++++++++++++++++
 Yi.Abp.Net8/src/Yi.Abp.Web/Yi.Abp.Web.csproj  |  4 ++++
 3 files changed, 28 insertions(+)
 create mode 100644 Yi.Abp.Net8/src/Yi.Abp.Web/README-DOCKER-BUILD.md

diff --git a/Yi.Abp.Net8/src/Yi.Abp.Web/Dockerfile b/Yi.Abp.Net8/src/Yi.Abp.Web/Dockerfile
index 91301637..21592fb0 100644
--- a/Yi.Abp.Net8/src/Yi.Abp.Web/Dockerfile
+++ b/Yi.Abp.Net8/src/Yi.Abp.Web/Dockerfile
@@ -8,6 +8,8 @@ EXPOSE 8080
 FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
 ARG BUILD_CONFIGURATION=Release
 WORKDIR /src
+
+COPY ./common.props ./
 COPY ["src/Yi.Abp.Web/Yi.Abp.Web.csproj", "src/Yi.Abp.Web/"]
 COPY ["framework/Yi.Framework.AspNetCore.Authentication.OAuth/Yi.Framework.AspNetCore.Authentication.OAuth.csproj", "framework/Yi.Framework.AspNetCore.Authentication.OAuth/"]
 COPY ["framework/Yi.Framework.AspNetCore/Yi.Framework.AspNetCore.csproj", "framework/Yi.Framework.AspNetCore/"]
diff --git a/Yi.Abp.Net8/src/Yi.Abp.Web/README-DOCKER-BUILD.md b/Yi.Abp.Net8/src/Yi.Abp.Web/README-DOCKER-BUILD.md
new file mode 100644
index 00000000..aba1e37f
--- /dev/null
+++ b/Yi.Abp.Net8/src/Yi.Abp.Web/README-DOCKER-BUILD.md
@@ -0,0 +1,22 @@
+# Docker 构建说明
+
+## 执行命令
+
+```shell
+# 在Yi.Abp.Net8 目录下执行
+docker build -t xxx-xxx:${BUILD_NUMBER} -f ./src/Yi.Abp.Web/Dockerfile . 
+
+```
+
+## 注意
+
+NuGet 源国内访问有时候会报错，可以考虑切换成华为源，加上参数
+
+```shell
+RUN dotnet restore --source https://repo.huaweicloud.com/repository/nuget/v3/index.json "./src/Yi.Abp.Web/./Yi.Abp.Web.csproj"
+
+RUN dotnet build --source https://repo.huaweicloud.com/repository/nuget/v3/index.json "./Yi.Abp.Web.csproj" -c $BUILD_CONFIGURATION -o /app/build
+
+RUN dotnet publish --source https://repo.huaweicloud.com/repository/nuget/v3/index.json "./Yi.Abp.Web.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false
+
+```
\ No newline at end of file
diff --git a/Yi.Abp.Net8/src/Yi.Abp.Web/Yi.Abp.Web.csproj b/Yi.Abp.Net8/src/Yi.Abp.Web/Yi.Abp.Web.csproj
index 2623b61f..5be942ee 100644
--- a/Yi.Abp.Net8/src/Yi.Abp.Web/Yi.Abp.Web.csproj
+++ b/Yi.Abp.Net8/src/Yi.Abp.Web/Yi.Abp.Web.csproj
@@ -10,6 +10,10 @@
   <ItemGroup>
     <PackageReference Include="Hangfire.MemoryStorage" Version="1.8.1.1" />
     <PackageReference Include="Hangfire.Redis.StackExchange" Version="1.9.4" />
+    <!-- 解决 docker 构建冲突问题，冲突版本信息如下 -->
+    <!-- Yi.Abp.Web -> Hangfire.Redis.StackExchange 1.9.4 -> Hangfire.Core (>= 1.8.7)  -->
+    <!-- Yi.Abp.Web -> Yi.Abp.Application -> Yi.Framework.Rbac.Application -> Volo.Abp.BackgroundJobs.HangFire 0.4.1 -> Volo.Abp.HangFire 0.4.1 -> Hangfire.AspNetCore 1.6.19 -> Hangfire.Core (= 1.6.19). -->
+    <PackageReference Include="Hangfire.Core" Version="1.8.14" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.3" />
     <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.3" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.6" />