diff --git a/Dockerfile b/Dockerfile index db7e3d8..30e61d6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ -FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base +FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base WORKDIR /app EXPOSE 80 EXPOSE 443 @@ -15,7 +15,7 @@ RUN ln -s /usr/lib/libgdiplus.so /usr/lib/gdiplus.dll #COPY msyhbd.ttc /usr/share/fonts/msyhbd.tt #COPY msyhl.ttc /usr/share/fonts/msyhl.tt -FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build WORKDIR /src COPY ["GDZZ.Web.Entry/GDZZ.Web.Entry.csproj", "GDZZ.Web.Entry/"] COPY ["GDZZ.Web.Core/GDZZ.Web.Core.csproj", "GDZZ.Web.Core/"] diff --git a/GDZZ.sln b/GDZZ.sln index 7ff1d87..f4e0e13 100644 --- a/GDZZ.sln +++ b/GDZZ.sln @@ -17,7 +17,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GDZZ.CodeFirst", "GDZZ.Code EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docker", "Docker", "{DFF1AFDC-3203-4914-AAFD-9303BC953C7E}" ProjectSection(SolutionItems) = preProject - Dockerfile.txt = Dockerfile.txt + Dockerfile = Dockerfile EndProjectSection EndProject Global