Merge pull request #960 from nvllsvm/dock

Use jellyfin/ffmpeg image
This commit is contained in:
Andrew Rabert 2019-02-20 13:15:23 -05:00 committed by GitHub
commit 8c53407a9d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -9,7 +9,7 @@ RUN dotnet publish \
--output /jellyfin \ --output /jellyfin \
Jellyfin.Server Jellyfin.Server
FROM jrottenberg/ffmpeg:4.0-vaapi as ffmpeg FROM jellyfin/ffmpeg as ffmpeg
FROM microsoft/dotnet:${DOTNET_VERSION}-runtime FROM microsoft/dotnet:${DOTNET_VERSION}-runtime
# libfontconfig1 is required for Skia # libfontconfig1 is required for Skia
RUN apt-get update \ RUN apt-get update \