diff --git a/Dev.Dockerfile b/Dev.Dockerfile new file mode 100644 index 0000000..e6ffe07 --- /dev/null +++ b/Dev.Dockerfile @@ -0,0 +1,32 @@ +# FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base +FROM registry.cn-qingdao.aliyuncs.com/jisheyun/aspnetcore:9.0.6_ub24_simsun_pdp_v341 AS base +WORKDIR /app +EXPOSE 8080 +EXPOSE 443 +ENV TZ=Asia/Shanghai +ENV ASPNETCORE_ENVIRONMENT=Production + +FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build +COPY ["JiShe.IoT.Admin.sln", "."] +COPY ["Directory.Build.JiShe.targets", "."] +COPY ["Directory.Build.Microsoft.targets", "."] +COPY ["Directory.Build.props", "."] +COPY ["Directory.Build.targets", "."] +COPY ["Directory.Build.Volo.targets", "."] +COPY ["NuGet.Config", "."] +COPY ["host/", "host/"] +COPY ["src/", "src/"] +COPY ["JiShe.ServicePro/", "JiShe.ServicePro/"] + +WORKDIR /host/JiShe.IoT.HttpApi.Host + +FROM build AS publish +RUN dotnet publish "JiShe.IoT.HttpApi.Host.csproj" -c Debug -o /app/publish /p:UseAppHost=false + +FROM base AS final +WORKDIR /app +COPY --from=publish /app/publish . +ENTRYPOINT ["dotnet", "JiShe.IoT.HttpApi.Host.dll"] + + + diff --git a/Directory.Build.props b/Directory.Build.props index 3051f1d..12bd30a 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -2,7 +2,7 @@ - 1.0.5.39 + 1.0.5.40 9.1.1 diff --git a/Dockerfile b/Dockerfile index b48da64..f34140f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,5 @@ -FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base +#FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base +FROM registry.cn-qingdao.aliyuncs.com/jisheyun/aspnetcore:9.0.6_ub24_simsun_pdp_v341 AS base WORKDIR /app EXPOSE 8080 EXPOSE 443 diff --git a/JiShe.IoT.Admin.sln b/JiShe.IoT.Admin.sln index a4afb50..3da7bb7 100644 --- a/JiShe.IoT.Admin.sln +++ b/JiShe.IoT.Admin.sln @@ -34,6 +34,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.IoT.DbMigrator", "src EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "0.Solution Items", "0.Solution Items", "{2C4A6DB8-8D9E-42E6-B7C3-1EDB7B3DE22E}" ProjectSection(SolutionItems) = preProject + Dev.Dockerfile = Dev.Dockerfile Directory.Build.JiShe.targets = Directory.Build.JiShe.targets Directory.Build.Microsoft.targets = Directory.Build.Microsoft.targets Directory.Build.props = Directory.Build.props diff --git a/src/JiShe.IoT.EntityFrameworkCore/Migrations/20250611083124_initCreate.Designer.cs b/src/JiShe.IoT.EntityFrameworkCore/Migrations/20250620054425_initCreat.Designer.cs similarity index 99% rename from src/JiShe.IoT.EntityFrameworkCore/Migrations/20250611083124_initCreate.Designer.cs rename to src/JiShe.IoT.EntityFrameworkCore/Migrations/20250620054425_initCreat.Designer.cs index 2d49600..8100c0a 100644 --- a/src/JiShe.IoT.EntityFrameworkCore/Migrations/20250611083124_initCreate.Designer.cs +++ b/src/JiShe.IoT.EntityFrameworkCore/Migrations/20250620054425_initCreat.Designer.cs @@ -13,8 +13,8 @@ using Volo.Abp.EntityFrameworkCore; namespace JiShe.IoT.Migrations { [DbContext(typeof(IoTDbContext))] - [Migration("20250611083124_initCreate")] - partial class initCreate + [Migration("20250620054425_initCreat")] + partial class initCreat { /// protected override void BuildTargetModel(ModelBuilder modelBuilder) diff --git a/src/JiShe.IoT.EntityFrameworkCore/Migrations/20250611083124_initCreate.cs b/src/JiShe.IoT.EntityFrameworkCore/Migrations/20250620054425_initCreat.cs similarity index 99% rename from src/JiShe.IoT.EntityFrameworkCore/Migrations/20250611083124_initCreate.cs rename to src/JiShe.IoT.EntityFrameworkCore/Migrations/20250620054425_initCreat.cs index 6382685..fca9040 100644 --- a/src/JiShe.IoT.EntityFrameworkCore/Migrations/20250611083124_initCreate.cs +++ b/src/JiShe.IoT.EntityFrameworkCore/Migrations/20250620054425_initCreat.cs @@ -6,7 +6,7 @@ using Microsoft.EntityFrameworkCore.Migrations; namespace JiShe.IoT.Migrations { /// - public partial class initCreate : Migration + public partial class initCreat : Migration { /// protected override void Up(MigrationBuilder migrationBuilder)