diff --git a/Dockerfile b/Dockerfile index 6ede522a..66feaa94 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,16 +3,28 @@ RUN apt-get update && apt-get install -y ffmpeg # https://hub.docker.com/_/microsoft-dotnet FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build +RUN apt-get update && apt-get install -y ca-certificates WORKDIR /source # copy csproj and restore as distinct layers COPY *.sln . COPY ErsatzTV/*.csproj ./ErsatzTV/ -COPY ErsatzTV.Tests/*.csproj ./ErsatzTV.Tests/ +COPY generated/ErsatzTV.Api.Sdk/src/ErsatzTV.Api.Sdk/*.csproj ./generated/ErsatzTV.Api.Sdk/src/ErsatzTV.Api.Sdk/ +COPY ErsatzTV.Application/*.csproj ./ErsatzTV.Application/ +COPY ErsatzTV.CommandLine/*.csproj ./ErsatzTV.CommandLine/ +COPY ErsatzTV.Core/*.csproj ./ErsatzTV.Core/ +COPY ErsatzTV.Core.Tests/*.csproj ./ErsatzTV.Core.Tests/ +COPY ErsatzTV.Infrastructure/*.csproj ./ErsatzTV.Infrastructure/ RUN dotnet restore -r linux-x64 # copy everything else and build app COPY ErsatzTV/. ./ErsatzTV/ +COPY generated/ErsatzTV.Api.Sdk/src/ErsatzTV.Api.Sdk/. ./generated/ErsatzTV.Api.Sdk/src/ErsatzTV.Api.Sdk/ +COPY ErsatzTV.Application/. ./ErsatzTV.Application/ +COPY ErsatzTV.CommandLine/. ./ErsatzTV.CommandLine/ +COPY ErsatzTV.Core/. ./ErsatzTV.Core/ +COPY ErsatzTV.Core.Tests/. ./ErsatzTV.Core.Tests/ +COPY ErsatzTV.Infrastructure/. ./ErsatzTV.Infrastructure/ WORKDIR /source/ErsatzTV RUN dotnet publish -c release -o /app -r linux-x64 --self-contained false --no-restore diff --git a/ErsatzTV.Core/FileSystemLayout.cs b/ErsatzTV.Core/FileSystemLayout.cs index 1e811e2d..f683d9ee 100644 --- a/ErsatzTV.Core/FileSystemLayout.cs +++ b/ErsatzTV.Core/FileSystemLayout.cs @@ -6,7 +6,7 @@ namespace ErsatzTV.Core public static class FileSystemLayout { public static readonly string AppDataFolder = Path.Combine( - Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), + Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData, Environment.SpecialFolderOption.Create), "ersatztv"); public static readonly string DatabasePath = Path.Combine(AppDataFolder, "ersatztv.sqlite3"); diff --git a/ErsatzTV/appsettings.json b/ErsatzTV/appsettings.json index d753b32e..da271c44 100644 --- a/ErsatzTV/appsettings.json +++ b/ErsatzTV/appsettings.json @@ -4,7 +4,7 @@ "Serilog.Sinks.Console" ], "MinimumLevel": { - "Default": "Information", + "Default": "Debug", "Override": { "Microsoft": "Warning", "System.Net.Http.HttpClient": "Warning" @@ -14,7 +14,7 @@ { "Name": "Console", "Args": { - "formatter": "Serilog.Formatting.Compact.CompactJsonFormatter, Serilog.Formatting.Compact" + "theme": "Serilog.Sinks.SystemConsole.Themes.AnsiConsoleTheme::Code, Serilog.Sinks.Console" } } ], diff --git a/docker-compose.yml b/docker-compose.yml index 29f6a199..8cc98e58 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,3 +6,8 @@ services: context: . ports: - "8989:80" + volumes: + - ersatztv:/root/.local/share/ersatztv + #- /media/shared:/media/shared:ro +volumes: + ersatztv: