diff options
| author | Bond-009 <bond.009@outlook.com> | 2019-01-30 16:57:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-30 16:57:15 +0100 |
| commit | 1ea219bf3f5c0708c3afa5fa2d897ca5212b5e04 (patch) | |
| tree | b3478e7210659ef7fa1e305e814c188ffd152fea /Dockerfile | |
| parent | a709cbdc64de36a1ce989636a19344af61d9026d (diff) | |
| parent | ffcf6bdd3aaad5068decf84b0400e433fdb8323c (diff) | |
Merge branch 'master' into culture
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/Dockerfile b/Dockerfile index 4f727b4b4c..c79d6f8ee1 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 |