diff options
| author | Andrew Rabert <6550543+nvllsvm@users.noreply.github.com> | 2019-01-04 23:52:40 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-04 23:52:40 -0500 |
| commit | 893e7c5a65c2ed304f40d14b83277901a2426c13 (patch) | |
| tree | 44fcde6a93990ee9f8e3df40ce8d3ec70db46330 | |
| parent | cc4d17edbd23ee604ecdd41e9f0b3fb35a0c98da (diff) | |
| parent | 227f9da3e5f5a247e9b85abe2d150aa5ffe9fc72 (diff) | |
Merge pull request #411 from bfayers/docker-ffmpeg403
Change Dockerfile to use ffmpeg 4.0.3 rather than a distro one.
| -rw-r--r-- | Dockerfile | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Dockerfile b/Dockerfile index f5e345225..47414ad12 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,9 +10,15 @@ 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 + VOLUME /config /media + +ARG FFMPEG_URL=https://www.johnvansickle.com/ffmpeg/old-releases/ffmpeg-4.0.3-64bit-static.tar.xz +RUN apt update \ + && apt install -y xz-utils \ + && curl ${FFMPEG_URL} | tar Jxf - -C /usr/bin --wildcards --strip-components=1 ffmpeg*/ffmpeg ffmpeg*/ffprobe \ + && apt remove -y xz-utils + 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 |