mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-06 11:34:57 +02:00
Merge pull request #1845 from joshuaboniface/mesa-va-drivers-fix
Correct missing mesa-va-drivers package
This commit is contained in:
commit
d900cc5c53
1 changed files with 7 additions and 4 deletions
11
Dockerfile
11
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"
|
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 jellyfin/ffmpeg:${FFMPEG_VERSION} as ffmpeg
|
||||||
|
|
||||||
FROM mcr.microsoft.com/dotnet/core/runtime:${DOTNET_VERSION}
|
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 \
|
RUN apt-get update \
|
||||||
&& apt-get install --no-install-recommends --no-install-suggests -y \
|
&& apt-get install --no-install-recommends --no-install-suggests -y \
|
||||||
libfontconfig1 mesa-va-drivers \
|
libfontconfig1 mesa-va-drivers \
|
||||||
|
@ -27,9 +33,6 @@ RUN apt-get update \
|
||||||
&& rm -rf /var/lib/apt/lists/* \
|
&& rm -rf /var/lib/apt/lists/* \
|
||||||
&& mkdir -p /cache /config /media \
|
&& mkdir -p /cache /config /media \
|
||||||
&& chmod 777 /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
|
EXPOSE 8096
|
||||||
VOLUME /cache /config /media
|
VOLUME /cache /config /media
|
||||||
|
|
Loading…
Reference in a new issue