aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua M. Boniface <joshua@boniface.me>2019-10-06 15:12:48 -0400
committerGitHub <noreply@github.com>2019-10-06 15:12:48 -0400
commitd900cc5c53ac27887d03afd5a3d4d61ea4c6a69b (patch)
treebafffae4586678528ec7b61ee2e1f7b1e77342cc
parent5c456231b144518e838c22bb5777df82c7afcf94 (diff)
parentabde7c024210a7510fdba0c1efa5807f464012d0 (diff)
Merge pull request #1845 from joshuaboniface/mesa-va-drivers-fix
Correct missing mesa-va-drivers package
-rw-r--r--Dockerfile11
1 files changed, 7 insertions, 4 deletions
diff --git a/Dockerfile b/Dockerfile
index 69cb5e0dd..a45576868 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,8 +17,14 @@ 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"
FROM jellyfin/ffmpeg:${FFMPEG_VERSION} as ffmpeg
+
FROM mcr.microsoft.com/dotnet/core/runtime:${DOTNET_VERSION}
-# libfontconfig1 is required for Skia
+COPY --from=ffmpeg / /
+COPY --from=builder /jellyfin /jellyfin
+COPY --from=web-builder /dist /jellyfin/jellyfin-web
+# Install dependencies:
+# libfontconfig1: needed for Skia
+# mesa-va-drivers: needed for VAAPI
RUN apt-get update \
&& apt-get install --no-install-recommends --no-install-suggests -y \
libfontconfig1 mesa-va-drivers \
@@ -27,9 +33,6 @@ RUN apt-get update \
&& rm -rf /var/lib/apt/lists/* \
&& mkdir -p /cache /config /media \
&& chmod 777 /cache /config /media
-COPY --from=ffmpeg / /
-COPY --from=builder /jellyfin /jellyfin
-COPY --from=web-builder /dist /jellyfin/jellyfin-web
EXPOSE 8096
VOLUME /cache /config /media