diff --git a/CoreCms.Net.Web.Admin/Dockerfile b/CoreCms.Net.Web.Admin/Dockerfile
index f08aadc..ccd5a3e 100644
--- a/CoreCms.Net.Web.Admin/Dockerfile
+++ b/CoreCms.Net.Web.Admin/Dockerfile
@@ -1,14 +1,14 @@
# 请参阅 https://aka.ms/customizecontainer 以了解如何自定义调试容器,以及 Visual Studio 如何使用此 Dockerfile 生成映像以更快地进行调试。
# 此阶段用于在快速模式(默认为调试配置)下从 VS 运行时
-FROM mcr.microsoft.com/dotnet/aspnet:8.0-noble AS base
+FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
USER $APP_UID
WORKDIR /app
EXPOSE 80
# 此阶段用于生成服务项目
-FROM mcr.microsoft.com/dotnet/sdk:8.0-noble AS build
+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
ARG BUILD_CONFIGURATION=Release
WORKDIR /src
COPY ["CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.csproj", "CoreCms.Net.Web.Admin/"]
diff --git a/CoreCms.Net.Web.WebApi/CoreCms.Net.Web.WebApi.csproj b/CoreCms.Net.Web.WebApi/CoreCms.Net.Web.WebApi.csproj
index 3010d37..4082c79 100644
--- a/CoreCms.Net.Web.WebApi/CoreCms.Net.Web.WebApi.csproj
+++ b/CoreCms.Net.Web.WebApi/CoreCms.Net.Web.WebApi.csproj
@@ -5,6 +5,7 @@
zh-Hans
false
077906fd-e490-4431-9bae-c3a48ae21992
+ Linux
@@ -58,6 +59,7 @@
+
@@ -99,9 +101,6 @@
Always
-
- PreserveNewest
-
diff --git a/CoreCms.Net.Web.WebApi/Dockerfile b/CoreCms.Net.Web.WebApi/Dockerfile
deleted file mode 100644
index f8bafdc..0000000
--- a/CoreCms.Net.Web.WebApi/Dockerfile
+++ /dev/null
@@ -1,14 +0,0 @@
-FROM mcr.microsoft.com/dotnet/aspnet:5.0
-
-WORKDIR /app
-
-EXPOSE 80
-
-COPY ./ /app
-
-ENV TZ=Asia/Shanghai
-
-RUN sed -i 's/MinProtocol = TLSv1.2/MinProtocol = TLSv1/g' /etc/ssl/openssl.cnf
-RUN sed -i 's/MinProtocol = TLSv1.2/MinProtocol = TLSv1/g' /usr/lib/ssl/openssl.cnf
-
-ENTRYPOINT ["dotnet", "CoreCms.Net.Web.WebApi.dll"]
\ No newline at end of file
diff --git a/CoreCms.Net.Web.WebApi/Properties/launchSettings.json b/CoreCms.Net.Web.WebApi/Properties/launchSettings.json
index 91e57d0..da4a3d9 100644
--- a/CoreCms.Net.Web.WebApi/Properties/launchSettings.json
+++ b/CoreCms.Net.Web.WebApi/Properties/launchSettings.json
@@ -1,13 +1,4 @@
{
- "iisSettings": {
- "windowsAuthentication": false,
- "anonymousAuthentication": true,
- "iisExpress": {
- "applicationUrl": "http://localhost:2015",
- "sslPort": 0
- }
- },
- "$schema": "http://json.schemastore.org/launchsettings.json",
"profiles": {
"IIS Express": {
"commandName": "IISExpress",
@@ -23,6 +14,25 @@
"ASPNETCORE_ENVIRONMENT": "Development"
},
"applicationUrl": "http://localhost:2015"
+ },
+ "Container (Dockerfile)": {
+ "commandName": "Docker",
+ "launchBrowser": true,
+ "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}",
+ "environmentVariables": {
+ "ASPNETCORE_HTTP_PORTS": "8080"
+ },
+ "publishAllPorts": true,
+ "useSSL": false
+ }
+ },
+ "$schema": "http://json.schemastore.org/launchsettings.json",
+ "iisSettings": {
+ "windowsAuthentication": false,
+ "anonymousAuthentication": true,
+ "iisExpress": {
+ "applicationUrl": "http://localhost:2015",
+ "sslPort": 0
}
}
}
\ No newline at end of file