diff options
| author | bfayers <bfayers@users.noreply.github.com> | 2019-01-04 20:04:58 +0000 |
|---|---|---|
| committer | bfayers <bfayers@users.noreply.github.com> | 2019-01-04 20:04:58 +0000 |
| commit | 2961dc0bdddaa06525b2d57b7ab1a7f1aac9a214 (patch) | |
| tree | 9d032f35004c3b91b16eda585b11ffaf6616bf52 | |
| parent | c39ca7dba3ea7c2b7ed0ab7e5207a72da75eecc8 (diff) | |
use ffmpeg 4.0.3 instead of distro provided (fixes chromecast + androidtv)
| -rw-r--r-- | Dockerfile | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/Dockerfile b/Dockerfile index f5e345225..c27ab5519 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,9 +10,23 @@ RUN export DOTNET_CLI_TELEMETRY_OPTOUT=1 \ FROM microsoft/dotnet:${DOTNET_VERSION}-runtime COPY --from=builder /jellyfin /jellyfin EXPOSE 8096 -RUN apt update \ - && apt install -y ffmpeg + +#RUN apt update \ +# && apt install -y ffmpeg +#Use a ffmpeg 4.0.3 build for now, until we have our own (fixes chromecasts and androidtv app) + VOLUME /config /media + +RUN apt update +RUN apt install -y wget xz-utils +RUN mkdir /ffmpeg +WORKDIR /ffmpeg +RUN wget https://www.johnvansickle.com/ffmpeg/old-releases/ffmpeg-4.0.3-64bit-static.tar.xz +RUN tar xf /ffmpeg/ffmpeg-4.0.3-64bit-static.tar.xz +RUN ln -s /ffmpeg/ffmpeg-4.0.3-64bit-static/ffmpeg /usr/local/sbin/ffmpeg +RUN ln -s /ffmpeg/ffmpeg-4.0.3-64bit-static/ffprobe /usr/local/sbin/ffprobe + + ENTRYPOINT if [ -n "$PUID$PGUID" ]; \ then echo "PUID/PGID are deprecated. Use Docker user param." >&2; exit 1; \ else dotnet /jellyfin/jellyfin.dll -programdata /config; fi |