diff --git a/.dockerignore b/.dockerignore index 3729ff0..74aebb0 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,25 +1,9 @@ -**/.classpath **/.dockerignore **/.env **/.git **/.gitignore -**/.project -**/.settings -**/.toolstarget **/.vs **/.vscode -**/*.*proj.user -**/*.dbmdl -**/*.jfm -**/azds.yaml **/bin -**/charts -**/docker-compose* -**/Dockerfile* -**/node_modules -**/npm-debug.log **/obj -**/secrets.dev.yaml -**/values.dev.yaml -LICENSE -README.md \ No newline at end of file +**/appsettings.Development.json diff --git a/Dockerfile b/Dockerfile index 201b29f..0069c48 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,40 +1,48 @@ -#See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging. - -FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS base - -#修改apt-get源，加速apt下载 -#RUN sed -i s@/deb.debian.org/@/mirrors.163.com/@g /etc/apt/sources.list.d/debian.sources -#RUN cat /etc/apt/sources.list -#安装fontconfig -RUN apt-get clean -RUN apt-get update -RUN apt-get install -y fontconfig - +# 鍩轰簬.NET 8瀹樻柟Linux闀滃儚鐨勫闃舵鏋勫缓 +FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base WORKDIR /app -EXPOSE 8066 -EXPOSE 443 +EXPOSE 9996 -FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build +# 璁剧疆鏃跺尯 +ENV TZ=Asia/Shanghai +RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone +# 瀹夎蹇呰鐨勪緷璧栵紙濡傚瓧浣撳簱锛岄傞厤MiniExcel绛夛級 +RUN apt-get update && apt-get install -y fontconfig && apt-get clean + +# 鏋勫缓闃舵 +FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build +ARG BUILD_CONFIGURATION=Release WORKDIR /src -COPY ["Easy.Admin.Web.Entry/Easy.Admin.Web.Entry.csproj", "Easy.Admin.Web.Entry/"] -COPY ["Easy.Admin.Web.Core/Easy.Admin.Web.Core.csproj", "Easy.Admin.Web.Core/"] -COPY ["Easy.Admin.Application/Easy.Admin.Application.csproj", "Easy.Admin.Application/"] -COPY ["Easy.Admin.Core/Easy.Admin.Core.csproj", "Easy.Admin.Core/"] -RUN dotnet restore "Easy.Admin.Web.Entry/Easy.Admin.Web.Entry.csproj" + +# 澶嶅埗csproj鏂囦欢骞惰繕鍘 +COPY ["YD_Event.Web.Entry/YD_Event.Web.Entry.csproj", "YD_Event.Web.Entry/"] +COPY ["YD_Event.Web.Core/YD_Event.Web.Core.csproj", "YD_Event.Web.Core/"] +COPY ["YD_Event.Application/YD_Event.Application.csproj", "YD_Event.Application/"] +COPY ["YD_Event.Core/YD_Event.Core.csproj", "YD_Event.Core/"] + +RUN dotnet restore "YD_Event.Web.Entry/YD_Event.Web.Entry.csproj" + +# 澶嶅埗鎵鏈夋簮鐮 COPY . . -WORKDIR "/src/Easy.Admin.Web.Entry" -RUN dotnet build "Easy.Admin.Web.Entry.csproj" -c Release -o /app/build +WORKDIR "/src/YD_Event.Web.Entry" +RUN dotnet build "YD_Event.Web.Entry.csproj" -c $BUILD_CONFIGURATION -o /app/build +# 鍙戝竷闃舵 FROM build AS publish -RUN dotnet publish "Easy.Admin.Web.Entry.csproj" -c Release -o /app/publish /p:UseAppHost=false +ARG BUILD_CONFIGURATION=Release +RUN dotnet publish "YD_Event.Web.Entry.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false +# 杩愯闃舵 FROM base AS final WORKDIR /app COPY --from=publish /app/publish . -# 设置时区 -ENV TZ=Asia/Shanghai -ENV ASPNETCORE_URLS 'http://*:8066' +# 閰嶇疆Kestrel绔彛 +ENV ASPNETCORE_URLS=http://*:9996 -ENTRYPOINT ["dotnet", "Easy.Admin.Web.Entry.dll"] \ No newline at end of file +# 鍋ュ悍妫鏌 +HEALTHCHECK --interval=30s --timeout=30s --start-period=5s --retries=3 \ + CMD curl -f http://localhost:9996/health || exit 1 + +ENTRYPOINT ["dotnet", "YD_Event.Web.Entry.dll"] diff --git a/YD_Event.Web.Core/Startup.cs b/YD_Event.Web.Core/Startup.cs index 8ae7b67..1e3b731 100644 --- a/YD_Event.Web.Core/Startup.cs +++ b/YD_Event.Web.Core/Startup.cs @@ -1,4 +1,4 @@ -锘縰sing Furion; +using Furion; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; @@ -60,6 +60,8 @@ public class Startup : AppStartup }); services.AddConsoleFormatter(); + // 娣诲姞鍋ュ悍妫鏌 + services.AddHealthChecks(); // 鍏ㄥ眬鏃ュ織 鏂囨。锛歨ttp://furion.baiqian.ltd/docs/logging/#18116-%E8%BE%93%E5%87%BA-json-%E6%94%AF%E6%8C%81%E5%BF%BD%E7%95%A5%E5%B1%9E%E6%80%A7%E5%90%8D%E6%88%96%E5%B1%9E%E6%80%A7%E7%B1%BB%E5%9E%8B services.AddMonitorLogging(options => @@ -215,6 +217,7 @@ public class Startup : AppStartup app.UseEndpoints(endpoints => { + endpoints.MapHealthChecks("/health"); endpoints.MapControllers(); }); } diff --git a/YD_Event.Web.Entry/Program.cs b/YD_Event.Web.Entry/Program.cs index 65ae485..bd526bf 100644 --- a/YD_Event.Web.Entry/Program.cs +++ b/YD_Event.Web.Entry/Program.cs @@ -1 +1,8 @@ -Serve.Run(RunOptions.Default.WithArgs(args)); +Serve.Run(RunOptions.Default + .WithArgs(args) + .ConfigureBuilder(builder => + { + // 纭繚瀹瑰櫒鍐呯粦瀹氬埌鎵鏈塈P锛岀鍙9996 + builder.WebHost.UseUrls("http://*:9996"); + }) +); diff --git a/YD_Event.Web.Entry/Properties/PublishProfiles/FolderProfile.pubxml b/YD_Event.Web.Entry/Properties/PublishProfiles/FolderProfile.pubxml new file mode 100644 index 0000000..bd30982 --- /dev/null +++ b/YD_Event.Web.Entry/Properties/PublishProfiles/FolderProfile.pubxml @@ -0,0 +1,15 @@ +锘 + + + + false + false + true + Release + Any CPU + FileSystem + D:\鍙戝竷\EventServer + FileSystem + <_TargetId>Folder + + \ No newline at end of file diff --git a/YD_Event.Web.Entry/YD_Event.Web.Entry.csproj.user b/YD_Event.Web.Entry/YD_Event.Web.Entry.csproj.user index ebba491..90f660e 100644 --- a/YD_Event.Web.Entry/YD_Event.Web.Entry.csproj.user +++ b/YD_Event.Web.Entry/YD_Event.Web.Entry.csproj.user @@ -5,5 +5,6 @@ YD_Event.Web.Entry + F:\椤圭洰\YD\YD_Event.Admin\YD_Event.Web.Entry\Properties\PublishProfiles\FolderProfile.pubxml \ No newline at end of file diff --git a/YD_Event.Web.Entry/appsettings.json b/YD_Event.Web.Entry/appsettings.json index 52b1a4e..c3446b4 100644 --- a/YD_Event.Web.Entry/appsettings.json +++ b/YD_Event.Web.Entry/appsettings.json @@ -7,6 +7,13 @@ "Microsoft.EntityFrameworkCore": "Information" } }, + "Kestrel": { + "Endpoints": { + "Http": { + "Url": "http://*:9996" + } + } + }, "AllowedHosts": "*", "ConnectionConfigs": [ {