diff options
| author | Andrew Rabert <6550543+nvllsvm@users.noreply.github.com> | 2020-03-05 09:41:14 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-05 09:41:14 -0500 |
| commit | ca585f12b3297f58e8f490b03b64729716eb2f40 (patch) | |
| tree | 1bf4bc9efc9039122d19ca3177e052aabeeb7c96 /Dockerfile | |
| parent | e80c9bb8c6e8fca4b1150e39518b24ef359c2998 (diff) | |
Fix Docker packages (#2499)
* Fix Vaapi Intel packages
https://github.com/jellyfin/jellyfin/issues/1901#issuecomment-593114951
Still need to compile with the packages to verify it builds properly. Arm builds probably need it too.
* Update Dockerfile
* Update Dockerfile
* Update Dockerfile.arm
* Update Dockerfile.arm
* Update Dockerfile.arm64
* Update Dockerfile.arm
* Update Dockerfile.arm
* Update Dockerfile.arm
* Update Dockerfile.arm64
* Update Dockerfile.arm64
* Update Dockerfile.arm
* Update Dockerfile
* shift from curl to git for web install
removed the necessity of curl, tar and package availability and using the source directly
* Update Dockerfile.arm
* Update Dockerfile.arm64
* Update Dockerfile
* Update Dockerfile
* Update Dockerfile.arm
* Update Dockerfile.arm64
* clean up packages and remove unnecessary ARG
* Update Dockerfile
* Update Dockerfile.arm64
* Update Dockerfile
* Update Dockerfile.arm64
* Update Dockerfile
* Update Dockerfile.arm
* Update Dockerfile.arm64
* Explainations
* Update Dockerfile.arm
* Update Dockerfile.arm64
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/Dockerfile b/Dockerfile index 1029a4cee..73ab3d790 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,6 +21,13 @@ RUN dotnet publish Jellyfin.Server --disable-parallel --configuration Release -- FROM jellyfin/ffmpeg:${FFMPEG_VERSION} as ffmpeg FROM debian:buster-slim +# https://askubuntu.com/questions/972516/debian-frontend-environment-variable +ARG DEBIAN_FRONTEND="noninteractive" +# http://stackoverflow.com/questions/48162574/ddg#49462622 +ARG APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=DontWarn +# https://github.com/NVIDIA/nvidia-docker/wiki/Installation-(Native-GPU-Support) +ENV NVIDIA_DRIVER_CAPABILITIES="compute,video,utility" + COPY --from=ffmpeg /opt/ffmpeg /opt/ffmpeg COPY --from=builder /jellyfin /jellyfin COPY --from=web-builder /dist /jellyfin/jellyfin-web @@ -31,9 +38,16 @@ 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 ca-certificates \ - && apt-get clean autoclean \ - && apt-get autoremove \ + libfontconfig1 \ + libgomp1 \ + libva-drm2 \ + mesa-va-drivers \ + openssl \ + ca-certificates \ + vainfo \ + i965-va-driver \ + && apt-get clean autoclean -y\ + && apt-get autoremove -y\ && rm -rf /var/lib/apt/lists/* \ && mkdir -p /cache /config /media \ && chmod 777 /cache /config /media \ |