From 27f9981142b4a75ceaff3a4b0f13f40b7d9467d6 Mon Sep 17 00:00:00 2001 From: Andrew Rabert Date: Fri, 1 Mar 2019 00:17:46 -0500 Subject: [PATCH] Treat jellyfin-web as just another dependency for Docker builds --- Dockerfile | 6 ++++++ Dockerfile.arm | 6 ++++++ Dockerfile.arm64 | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/Dockerfile b/Dockerfile index e2d424df78..91a4f5a2d2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,6 +20,12 @@ RUN apt-get update \ && chmod 777 /cache /config /media COPY --from=ffmpeg / / COPY --from=builder /jellyfin /jellyfin + +ARG JELLYFIN_WEB_VERSION=10.2.2 +RUN curl -L https://github.com/jellyfin/jellyfin-web/archive/v${JELLYFIN_WEB_VERSION}.tar.gz | tar zxf - \ + && rm -rf /jellyfin/jellyfin-web \ + && mv jellyfin-web-${JELLYFIN_WEB_VERSION} /jellyfin/jellyfin-web + EXPOSE 8096 VOLUME /cache /config /media ENTRYPOINT dotnet /jellyfin/jellyfin.dll \ diff --git a/Dockerfile.arm b/Dockerfile.arm index d220763a2c..42f0354a32 100644 --- a/Dockerfile.arm +++ b/Dockerfile.arm @@ -28,6 +28,12 @@ RUN apt-get update \ && mkdir -p /cache /config /media \ && chmod 777 /cache /config /media COPY --from=builder /jellyfin /jellyfin + +ARG JELLYFIN_WEB_VERSION=10.2.2 +RUN curl -L https://github.com/jellyfin/jellyfin-web/archive/v${JELLYFIN_WEB_VERSION}.tar.gz | tar zxf - \ + && rm -rf /jellyfin/jellyfin-web \ + && mv jellyfin-web-${JELLYFIN_WEB_VERSION} /jellyfin/jellyfin-web + EXPOSE 8096 VOLUME /cache /config /media ENTRYPOINT dotnet /jellyfin/jellyfin.dll \ diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index 243b841e92..d3103d3893 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -29,6 +29,12 @@ RUN apt-get update \ && mkdir -p /cache /config /media \ && chmod 777 /cache /config /media COPY --from=builder /jellyfin /jellyfin + +ARG JELLYFIN_WEB_VERSION=10.2.2 +RUN curl -L https://github.com/jellyfin/jellyfin-web/archive/v${JELLYFIN_WEB_VERSION}.tar.gz | tar zxf - \ + && rm -rf /jellyfin/jellyfin-web \ + && mv jellyfin-web-${JELLYFIN_WEB_VERSION} /jellyfin/jellyfin-web + EXPOSE 8096 VOLUME /cache /config /media ENTRYPOINT dotnet /jellyfin/jellyfin.dll \