diff options
| author | Andrew Rabert <6550543+nvllsvm@users.noreply.github.com> | 2019-01-26 14:23:41 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-26 14:23:41 -0500 |
| commit | e3b19c22a7506d6e03d6519b50797c1f49c70034 (patch) | |
| tree | 846677ca47d1ae87e37f0258035fec6e202e026b | |
| parent | 05fd76c0fafc60d8ba9e3ebbbfb136fa26cdf4ad (diff) | |
| parent | 9f83ee7b3ecc7613ddcdcf6a7920b05569e54d26 (diff) | |
Merge pull request #706 from sparky8251/docker-fix
Make another docker layer reusable
| -rw-r--r-- | Dockerfile | 9 | ||||
| -rw-r--r-- | Dockerfile.arm | 4 | ||||
| -rw-r--r-- | Dockerfile.arm64 | 4 |
3 files changed, 8 insertions, 9 deletions
diff --git a/Dockerfile b/Dockerfile index b014afcd2..4f727b4b4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,11 +22,6 @@ RUN export DOTNET_CLI_TELEMETRY_OPTOUT=1 \ FROM microsoft/dotnet:${DOTNET_VERSION}-runtime -COPY --from=builder /jellyfin /jellyfin -COPY --from=ffmpeg /ffmpeg-bin/* /usr/bin/ -EXPOSE 8096 -VOLUME /config /media - # libfontconfig1 is required for Skia RUN apt-get update \ && apt-get install --no-install-recommends --no-install-suggests -y \ @@ -34,4 +29,8 @@ RUN apt-get update \ && apt-get clean autoclean \ && apt-get autoremove \ && rm -rf /var/lib/{apt,dpkg,cache,log} +COPY --from=builder /jellyfin /jellyfin +COPY --from=ffmpeg /ffmpeg-bin/* /usr/bin/ +EXPOSE 8096 +VOLUME /config /media ENTRYPOINT dotnet /jellyfin/jellyfin.dll -programdata /config diff --git a/Dockerfile.arm b/Dockerfile.arm index 239fdd1c1..657cb4ac6 100644 --- a/Dockerfile.arm +++ b/Dockerfile.arm @@ -16,9 +16,9 @@ RUN export DOTNET_CLI_TELEMETRY_OPTOUT=1 \ FROM microsoft/dotnet:${DOTNET_VERSION}-runtime-stretch-slim-arm32v7 -COPY --from=builder /jellyfin /jellyfin -EXPOSE 8096 RUN apt-get update \ && apt-get install -y ffmpeg +COPY --from=builder /jellyfin /jellyfin +EXPOSE 8096 VOLUME /config /media ENTRYPOINT dotnet /jellyfin/jellyfin.dll -programdata /config diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index 6d7aa2118..979dfc1dc 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -24,10 +24,10 @@ RUN export DOTNET_CLI_TELEMETRY_OPTOUT=1 \ FROM microsoft/dotnet:${DOTNET_VERSION}-runtime-stretch-slim-arm64v8 +RUN apt-get update \ + && apt-get install -y ffmpeg COPY --from=qemu_extract qemu-* /usr/bin COPY --from=builder /jellyfin /jellyfin EXPOSE 8096 -RUN apt-get update \ - && apt-get install -y ffmpeg VOLUME /config /media ENTRYPOINT dotnet /jellyfin/jellyfin.dll -programdata /config |