diff options
| author | Joshua Boniface <joshua@boniface.me> | 2019-10-05 16:12:11 -0400 |
|---|---|---|
| committer | Joshua Boniface <joshua@boniface.me> | 2019-10-05 18:24:38 -0400 |
| commit | 762d17c3df8487a9466681c54c038b25b98f2a0c (patch) | |
| tree | 2d40cde2b469161b2cf4ae1b4e9185e10f42c646 | |
| parent | 60f8aa540fafa8c34e15d54447d010986f4dea40 (diff) | |
Move copy steps further so they're not overwriting
| -rw-r--r-- | Dockerfile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Dockerfile b/Dockerfile index 69cb5e0dd..ee6861342 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,8 +17,11 @@ ENV DOTNET_CLI_TELEMETRY_OPTOUT=1 RUN dotnet publish Jellyfin.Server --configuration Release --output="/jellyfin" --self-contained --runtime linux-x64 "-p:GenerateDocumentationFile=false;DebugSymbols=false;DebugType=none" FROM jellyfin/ffmpeg:${FFMPEG_VERSION} as ffmpeg + FROM mcr.microsoft.com/dotnet/core/runtime:${DOTNET_VERSION} -# libfontconfig1 is required for Skia +COPY --from=ffmpeg / / +COPY --from=builder /jellyfin /jellyfin +COPY --from=web-builder /dist /jellyfin/jellyfin-web RUN apt-get update \ && apt-get install --no-install-recommends --no-install-suggests -y \ libfontconfig1 mesa-va-drivers \ @@ -27,9 +30,6 @@ RUN apt-get update \ && rm -rf /var/lib/apt/lists/* \ && mkdir -p /cache /config /media \ && chmod 777 /cache /config /media -COPY --from=ffmpeg / / -COPY --from=builder /jellyfin /jellyfin -COPY --from=web-builder /dist /jellyfin/jellyfin-web EXPOSE 8096 VOLUME /cache /config /media |