diff options
| author | Vasily <JustAMan@users.noreply.github.com> | 2019-01-29 17:25:52 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-29 17:25:52 +0300 |
| commit | 8ab08dd041a44200786606ce737e49523e0169fd (patch) | |
| tree | 74a4053ba9b4f44b36de0fb97630af23e4f14095 | |
| parent | 8487319374fa86601a6fcfdae64ee75dc51ed357 (diff) | |
| parent | cc3422b96b514621300f6ed419ce8cb8f8622073 (diff) | |
Merge pull request #728 from nvllsvm/ffmpeg_docker
Use ffmpeg from jrottenberg/ffmpeg
| -rw-r--r-- | Dockerfile | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/Dockerfile b/Dockerfile index 4f727b4b4..c79d6f8ee 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,5 @@ ARG DOTNET_VERSION=2 - -# Download ffmpeg first to allow quicker rebuild of other layers -FROM alpine as ffmpeg -ARG FFMPEG_URL=https://www.johnvansickle.com/ffmpeg/old-releases/ffmpeg-4.0.3-64bit-static.tar.xz -RUN wget ${FFMPEG_URL} -O - | tar Jxf - \ - && mkdir ffmpeg-bin \ - && mv ffmpeg*/ffmpeg ffmpeg-bin \ - && mv ffmpeg*/ffprobe ffmpeg-bin - - FROM microsoft/dotnet:${DOTNET_VERSION}-sdk as builder WORKDIR /repo COPY . . @@ -20,7 +10,7 @@ RUN export DOTNET_CLI_TELEMETRY_OPTOUT=1 \ --output /jellyfin \ Jellyfin.Server - +FROM jrottenberg/ffmpeg:4.0-scratch as ffmpeg FROM microsoft/dotnet:${DOTNET_VERSION}-runtime # libfontconfig1 is required for Skia RUN apt-get update \ @@ -29,8 +19,8 @@ RUN apt-get update \ && apt-get clean autoclean \ && apt-get autoremove \ && rm -rf /var/lib/{apt,dpkg,cache,log} +COPY --from=ffmpeg / / COPY --from=builder /jellyfin /jellyfin -COPY --from=ffmpeg /ffmpeg-bin/* /usr/bin/ EXPOSE 8096 VOLUME /config /media ENTRYPOINT dotnet /jellyfin/jellyfin.dll -programdata /config |