diff --git a/Dev.Dockerfile b/Dev.Dockerfile new file mode 100644 index 0000000..95fec04 --- /dev/null +++ b/Dev.Dockerfile @@ -0,0 +1,30 @@ +FROM mcr.microsoft.com/dotnet/aspnet:9.0 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/"] + +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/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/JiShe.ServicePro b/JiShe.ServicePro index 1930aef..2e2ff42 160000 --- a/JiShe.ServicePro +++ b/JiShe.ServicePro @@ -1 +1 @@ -Subproject commit 1930aef81bda3a411cad2c05798975abc6b4597a +Subproject commit 2e2ff42c38196c6e03ec9b4c51b500ad41bc8a4c