diff --git a/Directory.Build.props b/Directory.Build.props index 86189fc..7d74709 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -3,6 +3,7 @@ 5 true + false diff --git a/Dockerfile b/Dockerfile index e83a40e..21c7507 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,20 +22,25 @@ COPY ./OpenttdDiscord.Validation.Tests/OpenttdDiscord.Validation.Tests.csproj ./ COPY ./OpenttdDiscord.sln . RUN dotnet restore --disable-parallel -COPY . /build +COPY . . FROM build AS publish ARG CONFIGURATION=Release -RUN dotnet publish "/build/OpenttdDiscord.Discord/OpenttdDiscord.Discord.csproj" -c $CONFIGURATION -o /app/publish -RUN dotnet publish "/build/OpenttdDiscord.Database.Migrator/OpenttdDiscord.Database.Migrator.csproj" -c $CONFIGURATION -o /app/migrator +RUN dotnet publish "/OpenttdDiscord.Discord/OpenttdDiscord.Discord.csproj" -c $CONFIGURATION -o /app/publish +RUN dotnet publish "/OpenttdDiscord.Database.Migrator/OpenttdDiscord.Database.Migrator.csproj" -c $CONFIGURATION -o /app/migrator FROM build as dbMigrations RUN dotnet tool install --global dotnet-ef --version 10.0.2 ENV PATH="$PATH:/root/.dotnet/tools" -WORKDIR /build/OpenttdDiscord.Database -RUN dotnet ef migrations script -v -i -o /script.sql +WORKDIR /OpenttdDiscord.Database +RUN dotnet restore --disable-parallel +WORKDIR / +RUN dotnet ef migrations script \ + --project OpenttdDiscord.Database/OpenttdDiscord.Database.csproj \ + --startup-project OpenttdDiscord.Database/OpenttdDiscord.Database.csproj \ + -v -i -o /script.sql ARG RUN_IMG=mcr.microsoft.com/dotnet/aspnet:6.0 FROM ${BUILD_IMG} AS run @@ -54,4 +59,5 @@ ENTRYPOINT ["bash", "-c", "./startup.sh"] - + + diff --git a/OpenttdDiscord.Database.Migrator/OpenttdDiscord.Database.Migrator.csproj b/OpenttdDiscord.Database.Migrator/OpenttdDiscord.Database.Migrator.csproj index bd606c4..0a69b3e 100644 --- a/OpenttdDiscord.Database.Migrator/OpenttdDiscord.Database.Migrator.csproj +++ b/OpenttdDiscord.Database.Migrator/OpenttdDiscord.Database.Migrator.csproj @@ -22,6 +22,6 @@ - + \ No newline at end of file diff --git a/OpenttdDiscord.Database.Tests/OpenttdDiscord.Database.Tests.csproj b/OpenttdDiscord.Database.Tests/OpenttdDiscord.Database.Tests.csproj index aca903c..8c50066 100644 --- a/OpenttdDiscord.Database.Tests/OpenttdDiscord.Database.Tests.csproj +++ b/OpenttdDiscord.Database.Tests/OpenttdDiscord.Database.Tests.csproj @@ -33,7 +33,7 @@ - - + + \ No newline at end of file diff --git a/OpenttdDiscord.Database/OpenttdDiscord.Database.csproj b/OpenttdDiscord.Database/OpenttdDiscord.Database.csproj index 43cbf93..99e7fce 100644 --- a/OpenttdDiscord.Database/OpenttdDiscord.Database.csproj +++ b/OpenttdDiscord.Database/OpenttdDiscord.Database.csproj @@ -26,6 +26,6 @@ - + \ No newline at end of file diff --git a/OpenttdDiscord.Discord/OpenttdDiscord.Discord.csproj b/OpenttdDiscord.Discord/OpenttdDiscord.Discord.csproj index 811d651..47a29a4 100644 --- a/OpenttdDiscord.Discord/OpenttdDiscord.Discord.csproj +++ b/OpenttdDiscord.Discord/OpenttdDiscord.Discord.csproj @@ -33,7 +33,7 @@ - + diff --git a/OpenttdDiscord.Domain.Tests/OpenttdDiscord.Domain.Tests.csproj b/OpenttdDiscord.Domain.Tests/OpenttdDiscord.Domain.Tests.csproj index a41e081..7535199 100644 --- a/OpenttdDiscord.Domain.Tests/OpenttdDiscord.Domain.Tests.csproj +++ b/OpenttdDiscord.Domain.Tests/OpenttdDiscord.Domain.Tests.csproj @@ -41,7 +41,7 @@ - - + + \ No newline at end of file diff --git a/OpenttdDiscord.Domain/OpenttdDiscord.Domain.csproj b/OpenttdDiscord.Domain/OpenttdDiscord.Domain.csproj index 7b90ff6..06d57e1 100644 --- a/OpenttdDiscord.Domain/OpenttdDiscord.Domain.csproj +++ b/OpenttdDiscord.Domain/OpenttdDiscord.Domain.csproj @@ -5,7 +5,7 @@ enable - + diff --git a/OpenttdDiscord.Infrastructure.Tests/OpenttdDiscord.Infrastructure.Tests.csproj b/OpenttdDiscord.Infrastructure.Tests/OpenttdDiscord.Infrastructure.Tests.csproj index 3e59bfa..4c03825 100644 --- a/OpenttdDiscord.Infrastructure.Tests/OpenttdDiscord.Infrastructure.Tests.csproj +++ b/OpenttdDiscord.Infrastructure.Tests/OpenttdDiscord.Infrastructure.Tests.csproj @@ -40,7 +40,7 @@ - - + + \ No newline at end of file diff --git a/OpenttdDiscord.Infrastructure/OpenttdDiscord.Infrastructure.csproj b/OpenttdDiscord.Infrastructure/OpenttdDiscord.Infrastructure.csproj index 06418a4..624d931 100644 --- a/OpenttdDiscord.Infrastructure/OpenttdDiscord.Infrastructure.csproj +++ b/OpenttdDiscord.Infrastructure/OpenttdDiscord.Infrastructure.csproj @@ -20,7 +20,7 @@ - - + + \ No newline at end of file diff --git a/OpenttdDiscord.Tests.Common/OpenttdDiscord.Tests.Common.csproj b/OpenttdDiscord.Tests.Common/OpenttdDiscord.Tests.Common.csproj index 0dd6779..0b514b1 100644 --- a/OpenttdDiscord.Tests.Common/OpenttdDiscord.Tests.Common.csproj +++ b/OpenttdDiscord.Tests.Common/OpenttdDiscord.Tests.Common.csproj @@ -17,6 +17,6 @@ - + \ No newline at end of file diff --git a/OpenttdDiscord.Validation.Tests/OpenttdDiscord.Validation.Tests.csproj b/OpenttdDiscord.Validation.Tests/OpenttdDiscord.Validation.Tests.csproj index 0c158b8..b970142 100644 --- a/OpenttdDiscord.Validation.Tests/OpenttdDiscord.Validation.Tests.csproj +++ b/OpenttdDiscord.Validation.Tests/OpenttdDiscord.Validation.Tests.csproj @@ -32,6 +32,6 @@ - + \ No newline at end of file diff --git a/OpenttdDiscord.Validation/OpenttdDiscord.Validation.csproj b/OpenttdDiscord.Validation/OpenttdDiscord.Validation.csproj index 7b312c0..a176431 100644 --- a/OpenttdDiscord.Validation/OpenttdDiscord.Validation.csproj +++ b/OpenttdDiscord.Validation/OpenttdDiscord.Validation.csproj @@ -16,6 +16,6 @@ - + \ No newline at end of file