From 1d94607a306521860df44982d6bfeb1a139def52 Mon Sep 17 00:00:00 2001 From: Sparky Date: Sat, 2 Feb 2019 09:00:04 -0500 Subject: Fix docker args After the change to runtime args in #749 docker broke. This fixes it. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index c79d6f8ee..37388fda9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,4 +23,4 @@ COPY --from=ffmpeg / / COPY --from=builder /jellyfin /jellyfin EXPOSE 8096 VOLUME /config /media -ENTRYPOINT dotnet /jellyfin/jellyfin.dll -programdata /config +ENTRYPOINT dotnet /jellyfin/jellyfin.dll --datadir /config -- cgit v1.2.3 From 22ffc5aee4f2f67c69a678217abc6a3171d6e329 Mon Sep 17 00:00:00 2001 From: Andrew Rabert Date: Fri, 8 Feb 2019 00:19:31 -0500 Subject: Use VAAPI-enabled ffmpeg --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index 37388fda9..266b59f1c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ RUN export DOTNET_CLI_TELEMETRY_OPTOUT=1 \ --output /jellyfin \ Jellyfin.Server -FROM jrottenberg/ffmpeg:4.0-scratch as ffmpeg +FROM jrottenberg/ffmpeg:4.0-vaapi as ffmpeg FROM microsoft/dotnet:${DOTNET_VERSION}-runtime # libfontconfig1 is required for Skia RUN apt-get update \ -- cgit v1.2.3