diff --git a/Dockerfile b/Dockerfile index e390c9fc..9745164b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,9 @@ FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build WORKDIR /src -# Install EF Core tools globally in the build stage where SDK is available -RUN dotnet tool install --global dotnet-ef - # Copy Directory.Packages.props first for central package management COPY ["Directory.Packages.props", "./"] +COPY ["Directory.Build.props", "./"] # Copy project files COPY ["src/Melodee.Blazor/Melodee.Blazor.csproj", "src/Melodee.Blazor/"] @@ -52,6 +50,7 @@ RUN chmod +x /entrypoint.sh COPY --from=build /src/src/Melodee.Common/ /app/src/Melodee.Common/ COPY --from=build /src/src/Melodee.Blazor/ /app/src/Melodee.Blazor/ COPY --from=build /src/Directory.Packages.props /app/ +COPY --from=build /src/Directory.Build.props /app/ # Create a non-root user and switch to it RUN groupadd -r melodee && useradd -r -g melodee -m melodee @@ -74,8 +73,8 @@ ENV MELODEE_PLAYLISTS_PATH="/app/playlists" USER melodee -# Install EF Core tools globally for the melodee user -RUN dotnet tool install --global dotnet-ef +# Install EF Core tools globally for the melodee user with specific version matching EF Core 10.0.1 +RUN dotnet tool install --global dotnet-ef --version 10.0.1 # Add tools to PATH ENV PATH="$PATH:/home/melodee/.dotnet/tools" diff --git a/src/Melodee.Blazor/Melodee.Blazor.csproj b/src/Melodee.Blazor/Melodee.Blazor.csproj index 25f3af03..b11f421d 100644 --- a/src/Melodee.Blazor/Melodee.Blazor.csproj +++ b/src/Melodee.Blazor/Melodee.Blazor.csproj @@ -68,12 +68,6 @@ - - - - - -