diff --git a/Project/adminBlazor/.dockerignore b/Project/adminBlazor/.dockerignore index fe1152b..38bece4 100644 --- a/Project/adminBlazor/.dockerignore +++ b/Project/adminBlazor/.dockerignore @@ -1,30 +1,25 @@ -**/.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 -!**/.gitignore -!.git/HEAD -!.git/config -!.git/packed-refs -!.git/refs/heads/** \ No newline at end of file +**/.dockerignore +**/.env +**/.git +**/.gitignore +**/.project +**/.settings +**/.toolstarget +**/.vs +**/.vscode +**/.idea +**/*.*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 diff --git a/Project/adminBlazor/adminBlazor.Api/Dockerfile b/Project/adminBlazor/adminBlazor.Api/Dockerfile index 7690b94..1b16200 100644 --- a/Project/adminBlazor/adminBlazor.Api/Dockerfile +++ b/Project/adminBlazor/adminBlazor.Api/Dockerfile @@ -1,20 +1,22 @@ -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 -FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build +ARG BUILD_CONFIGURATION=Release WORKDIR /src -COPY ["src/Minecraft.Crafting.Api/Minecraft.Crafting.Api.csproj", "Minecraft.Crafting.Api/"] -RUN dotnet restore "Minecraft.Crafting.Api/Minecraft.Crafting.Api.csproj" -COPY src/. . -WORKDIR "/src/Minecraft.Crafting.Api" -RUN dotnet build "Minecraft.Crafting.Api.csproj" -c Release -o /app/build +COPY ["adminBlazor.Api/adminBlazor.Api.csproj", "adminBlazor.Api/"] +RUN dotnet restore "adminBlazor.Api/adminBlazor.Api.csproj" +COPY . . +WORKDIR "/src/adminBlazor.Api" +RUN dotnet build "adminBlazor.Api.csproj" -c $BUILD_CONFIGURATION -o /app/build FROM build AS publish -RUN dotnet publish "Minecraft.Crafting.Api.csproj" -c Release -o /app/publish /p:UseAppHost=false +ARG BUILD_CONFIGURATION=Release +RUN dotnet publish "adminBlazor.Api.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false FROM base AS final WORKDIR /app COPY --from=publish /app/publish . -ENTRYPOINT ["dotnet", "Minecraft.Crafting.Api.dll"] \ No newline at end of file +ENTRYPOINT ["dotnet", "adminBlazor.Api.dll"] diff --git a/Project/adminBlazor/adminBlazor.Api/adminBlazor.Api.csproj b/Project/adminBlazor/adminBlazor.Api/adminBlazor.Api.csproj index ef88842..311d69b 100644 --- a/Project/adminBlazor/adminBlazor.Api/adminBlazor.Api.csproj +++ b/Project/adminBlazor/adminBlazor.Api/adminBlazor.Api.csproj @@ -1,9 +1,10 @@  - net6.0 + net7.0 enable enable + Linux @@ -11,5 +12,10 @@ + + + .dockerignore + +