diff options
| author | Anthony Lavado <anthony@lavado.ca> | 2020-02-12 02:01:56 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-12 02:01:56 -0500 |
| commit | 42066ee326277fb181f609a8530cf419569efbf8 (patch) | |
| tree | 4c119429d3689c03ed267880a4257cb6402c45ae /Dockerfile | |
| parent | 081d942d0361a4ad8aa918edcbb2f20c4c3f8471 (diff) | |
| parent | 684568e6d2ef163c91fa5faf26600c16acf4b0b8 (diff) | |
Merge branch 'master' into transcoding-throttling
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Dockerfile b/Dockerfile index 53a4252627..0bccd9d646 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,9 @@ FROM mcr.microsoft.com/dotnet/core/sdk:${DOTNET_VERSION}-buster as builder WORKDIR /repo COPY . . ENV DOTNET_CLI_TELEMETRY_OPTOUT=1 -RUN dotnet publish Jellyfin.Server --configuration Release --output="/jellyfin" --self-contained --runtime linux-x64 "-p:GenerateDocumentationFile=false;DebugSymbols=false;DebugType=none" +# because of changes in docker and systemd we need to not build in parallel at the moment +# see https://success.docker.com/article/how-to-reserve-resource-temporarily-unavailable-errors-due-to-tasksmax-setting +RUN dotnet publish Jellyfin.Server --disable-parallel --configuration Release --output="/jellyfin" --self-contained --runtime linux-x64 "-p:GenerateDocumentationFile=false;DebugSymbols=false;DebugType=none" FROM jellyfin/ffmpeg:${FFMPEG_VERSION} as ffmpeg FROM debian:buster-slim @@ -29,7 +31,7 @@ COPY --from=web-builder /dist /jellyfin/jellyfin-web # mesa-va-drivers: needed for VAAPI RUN apt-get update \ && apt-get install --no-install-recommends --no-install-suggests -y \ - libfontconfig1 libgomp1 libva-drm2 mesa-va-drivers openssl \ + libfontconfig1 libgomp1 libva-drm2 mesa-va-drivers openssl ca-certificates \ && apt-get clean autoclean \ && apt-get autoremove \ && rm -rf /var/lib/apt/lists/* \ |