diff options
| author | Joshua M. Boniface <joshua@boniface.me> | 2019-08-31 21:12:37 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-31 21:12:37 -0400 |
| commit | 0d7adc33828975559664729cc3c4009503f782de (patch) | |
| tree | d94a485570b751ec43b14a3e4619be90beb6e48a | |
| parent | a30876c3ff80323975c67447dff8ff4b4add4637 (diff) | |
| parent | 1c4755f26a8729370ba5624e3733a5e964f01bc0 (diff) | |
Merge pull request #1695 from nvllsvm/dfa
Make Docker ffmpeg version configurable
| -rw-r--r-- | Dockerfile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Dockerfile b/Dockerfile index f8e6fec31..a19ebcf2e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,8 @@ ENV DOTNET_CLI_TELEMETRY_OPTOUT=1 RUN bash -c "source deployment/common.build.sh && \ build_jellyfin Jellyfin.Server Release linux-x64 /jellyfin" -FROM jellyfin/ffmpeg as ffmpeg +ARG FFMPEG_VERSION=latest +FROM jellyfin/ffmpeg:${FFMPEG_VERSION} as ffmpeg FROM mcr.microsoft.com/dotnet/core/runtime:${DOTNET_VERSION} # libfontconfig1 is required for Skia RUN apt-get update \ |