Browse Source

fix docker and docker-compose

pull/1/head
Jason Dove 5 years ago
parent
commit
643246b04b
  1. 14
      Dockerfile
  2. 2
      ErsatzTV.Core/FileSystemLayout.cs
  3. 4
      ErsatzTV/appsettings.json
  4. 5
      docker-compose.yml

14
Dockerfile

@ -3,16 +3,28 @@ RUN apt-get update && apt-get install -y ffmpeg
# https://hub.docker.com/_/microsoft-dotnet # https://hub.docker.com/_/microsoft-dotnet
FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build
RUN apt-get update && apt-get install -y ca-certificates
WORKDIR /source WORKDIR /source
# copy csproj and restore as distinct layers # copy csproj and restore as distinct layers
COPY *.sln . COPY *.sln .
COPY ErsatzTV/*.csproj ./ErsatzTV/ 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 RUN dotnet restore -r linux-x64
# copy everything else and build app # copy everything else and build app
COPY ErsatzTV/. ./ErsatzTV/ 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 WORKDIR /source/ErsatzTV
RUN dotnet publish -c release -o /app -r linux-x64 --self-contained false --no-restore RUN dotnet publish -c release -o /app -r linux-x64 --self-contained false --no-restore

2
ErsatzTV.Core/FileSystemLayout.cs

@ -6,7 +6,7 @@ namespace ErsatzTV.Core
public static class FileSystemLayout public static class FileSystemLayout
{ {
public static readonly string AppDataFolder = Path.Combine( public static readonly string AppDataFolder = Path.Combine(
Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData, Environment.SpecialFolderOption.Create),
"ersatztv"); "ersatztv");
public static readonly string DatabasePath = Path.Combine(AppDataFolder, "ersatztv.sqlite3"); public static readonly string DatabasePath = Path.Combine(AppDataFolder, "ersatztv.sqlite3");

4
ErsatzTV/appsettings.json

@ -4,7 +4,7 @@
"Serilog.Sinks.Console" "Serilog.Sinks.Console"
], ],
"MinimumLevel": { "MinimumLevel": {
"Default": "Information", "Default": "Debug",
"Override": { "Override": {
"Microsoft": "Warning", "Microsoft": "Warning",
"System.Net.Http.HttpClient": "Warning" "System.Net.Http.HttpClient": "Warning"
@ -14,7 +14,7 @@
{ {
"Name": "Console", "Name": "Console",
"Args": { "Args": {
"formatter": "Serilog.Formatting.Compact.CompactJsonFormatter, Serilog.Formatting.Compact" "theme": "Serilog.Sinks.SystemConsole.Themes.AnsiConsoleTheme::Code, Serilog.Sinks.Console"
} }
} }
], ],

5
docker-compose.yml

@ -6,3 +6,8 @@ services:
context: . context: .
ports: ports:
- "8989:80" - "8989:80"
volumes:
- ersatztv:/root/.local/share/ersatztv
#- /media/shared:/media/shared:ro
volumes:
ersatztv:

Loading…
Cancel
Save