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.arm | |
| 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.arm')
| -rw-r--r-- | Dockerfile.arm | 31 |
1 files changed, 28 insertions, 3 deletions
diff --git a/Dockerfile.arm b/Dockerfile.arm index 5847de918..4c7aa6aa7 100644 --- a/Dockerfile.arm +++ b/Dockerfile.arm @@ -27,10 +27,35 @@ RUN dotnet publish Jellyfin.Server --configuration Release --output="/jellyfin" FROM multiarch/qemu-user-static:x86_64-arm as qemu FROM arm32v7/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=qemu /usr/bin/qemu-arm-static /usr/bin RUN apt-get update \ - && apt-get install --no-install-recommends --no-install-suggests -y ffmpeg \ - libssl-dev ca-certificates \ + && apt-get install --no-install-recommends --no-install-suggests -y ca-certificates gnupg curl && \ + curl -s https://repo.jellyfin.org/debian/jellyfin_team.gpg.key | apt-key add - && \ + curl -s https://keyserver.ubuntu.com/pks/lookup?op=get\&search=0x6587ffd6536b8826e88a62547876ae518cbcf2f2 | apt-key add - && \ + echo 'deb [arch=armhf] https://repo.jellyfin.org/debian buster main' > /etc/apt/sources.list.d/jellyfin.list && \ + echo "deb http://ppa.launchpad.net/ubuntu-raspi2/ppa/ubuntu bionic main">> /etc/apt/sources.list.d/raspbins.list && \ + apt-get update && \ + apt-get install --no-install-recommends --no-install-suggests -y \ + jellyfin-ffmpeg \ + libssl-dev \ + libfontconfig1 \ + libfreetype6 \ + libomxil-bellagio0 \ + libomxil-bellagio-bin \ + libraspberrypi0 \ + vainfo \ + libva2 \ + && apt-get remove curl gnupg -y \ + && 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 @@ -44,4 +69,4 @@ VOLUME /cache /config /media ENTRYPOINT ["./jellyfin/jellyfin", \ "--datadir", "/config", \ "--cachedir", "/cache", \ - "--ffmpeg", "/usr/bin/ffmpeg"] + "--ffmpeg", "/usr/lib/jellyfin-ffmpeg"] |