From 11e874ee07f55f02e610ef566464fc755e1519ba Mon Sep 17 00:00:00 2001 From: evanlihou Date: Wed, 23 Oct 2024 21:44:16 -0400 Subject: [PATCH] Fix build issues --- Dockerfile | 7 ++++--- FiMAdminApi.Data/FiMAdminApi.Data.csproj | 2 +- FiMAdminApi/FiMAdminApi.csproj | 6 +++--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index abaa89c..9bae836 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,16 @@ # TODO: Move these images back to stable once .NET 9 is released -FROM mcr.microsoft.com/dotnet/nightly/aspnet:9.0-preview AS base +FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base USER $APP_UID WORKDIR /app EXPOSE 8080 EXPOSE 8081 -FROM mcr.microsoft.com/dotnet/nightly/sdk:9.0-preview AS build +FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build ARG BUILD_CONFIGURATION=Debug WORKDIR /src COPY ["FiMAdminApi/FiMAdminApi.csproj", "FiMAdminApi/"] +COPY ["nuget.config", "."] RUN dotnet restore "FiMAdminApi/FiMAdminApi.csproj" COPY . . WORKDIR "/src/FiMAdminApi" @@ -17,7 +18,7 @@ RUN dotnet build "FiMAdminApi.csproj" -c $BUILD_CONFIGURATION -o /app/build FROM build AS publish ARG BUILD_CONFIGURATION=Debug -RUN dotnet publish "FiMAdminApi.csproj" -c $BUILD_CONFIGURATION -o /app/publish +RUN dotnet publish "FiMAdminApi.csproj" -c $BUILD_CONFIGURATION -o /app/publish --no-restore FROM base AS final WORKDIR /app diff --git a/FiMAdminApi.Data/FiMAdminApi.Data.csproj b/FiMAdminApi.Data/FiMAdminApi.Data.csproj index 1aaaac9..fcddad8 100644 --- a/FiMAdminApi.Data/FiMAdminApi.Data.csproj +++ b/FiMAdminApi.Data/FiMAdminApi.Data.csproj @@ -8,7 +8,7 @@ - + diff --git a/FiMAdminApi/FiMAdminApi.csproj b/FiMAdminApi/FiMAdminApi.csproj index f52cef2..ee87780 100644 --- a/FiMAdminApi/FiMAdminApi.csproj +++ b/FiMAdminApi/FiMAdminApi.csproj @@ -13,12 +13,12 @@ - - + + - +