diff options
| author | Vasily <JustAMan@users.noreply.github.com> | 2019-02-28 16:43:35 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-28 16:43:35 +0300 |
| commit | b7fd68d3669574fdacc770f68c7ae245699524d8 (patch) | |
| tree | 0e7799c11d3c02ab1ef12b2bb41e363503291437 | |
| parent | f384822aa539e0a86c5d3714b74c68549862745b (diff) | |
| parent | 1d1e6dede94596dc4e613a59c1561fe96447581c (diff) | |
Merge pull request #1017 from nvllsvm/dockerffmpeg
Set ffmpeg+ffprobe paths in Docker container
| -rw-r--r-- | Dockerfile | 6 | ||||
| -rw-r--r-- | Dockerfile.arm | 6 | ||||
| -rw-r--r-- | Dockerfile.arm64 | 6 |
3 files changed, 15 insertions, 3 deletions
diff --git a/Dockerfile b/Dockerfile index 356268841..e2d424df7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,4 +22,8 @@ COPY --from=ffmpeg / / COPY --from=builder /jellyfin /jellyfin EXPOSE 8096 VOLUME /cache /config /media -ENTRYPOINT dotnet /jellyfin/jellyfin.dll --datadir /config --cachedir /cache +ENTRYPOINT dotnet /jellyfin/jellyfin.dll \ + --datadir /config \ + --cachedir /cache \ + --ffmpeg /usr/local/bin/ffmpeg \ + --ffprobe /usr/local/bin/ffprobe diff --git a/Dockerfile.arm b/Dockerfile.arm index 69c5d446e..d220763a2 100644 --- a/Dockerfile.arm +++ b/Dockerfile.arm @@ -30,4 +30,8 @@ RUN apt-get update \ COPY --from=builder /jellyfin /jellyfin EXPOSE 8096 VOLUME /cache /config /media -ENTRYPOINT dotnet /jellyfin/jellyfin.dll --datadir /config --cachedir /cache +ENTRYPOINT dotnet /jellyfin/jellyfin.dll \ + --datadir /config \ + --cachedir /cache \ + --ffmpeg /usr/bin/ffmpeg \ + --ffprobe /usr/bin/ffprobe diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index b85f8735b..243b841e9 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -31,4 +31,8 @@ RUN apt-get update \ COPY --from=builder /jellyfin /jellyfin EXPOSE 8096 VOLUME /cache /config /media -ENTRYPOINT dotnet /jellyfin/jellyfin.dll --datadir /config --cachedir /cache +ENTRYPOINT dotnet /jellyfin/jellyfin.dll \ + --datadir /config \ + --cachedir /cache \ + --ffmpeg /usr/bin/ffmpeg \ + --ffprobe /usr/bin/ffprobe |