diff options
| author | Claus Vium <clausvium@gmail.com> | 2019-03-07 20:16:51 +0100 |
|---|---|---|
| committer | Claus Vium <clausvium@gmail.com> | 2019-03-07 20:16:51 +0100 |
| commit | 0abe57e930e44eab9566991f33b089d1e61cfb83 (patch) | |
| tree | 602be322daedca127ba66de07837ac8e792730a7 /Dockerfile.arm | |
| parent | dfff68b2f4ca8d3da59508eb4cbe2e751ed76f49 (diff) | |
| parent | ae0ecc1b10982d9240ecdcc82cb7299fc708aafb (diff) | |
Merge remote-tracking branch 'remotes/upstream/master' into kestrel_poc
Diffstat (limited to 'Dockerfile.arm')
| -rw-r--r-- | Dockerfile.arm | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/Dockerfile.arm b/Dockerfile.arm index 9d1c30619b..42f0354a32 100644 --- a/Dockerfile.arm +++ b/Dockerfile.arm @@ -17,11 +17,8 @@ RUN find . -type f -exec sed -i 's/netcoreapp2.1/netcoreapp3.0/g' {} \; # Discard objs - may cause failures if exists RUN find . -type d -name obj | xargs -r rm -r # Build -RUN dotnet publish \ - -r linux-arm \ - --configuration release \ - --output /jellyfin \ - Jellyfin.Server +RUN bash -c "source deployment/common.build.sh && \ + build_jellyfin Jellyfin.Server Release linux-arm /jellyfin" FROM microsoft/dotnet:${DOTNET_VERSION}-runtime-stretch-slim-arm32v7 @@ -31,6 +28,16 @@ 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 --datadir /config --cachedir /cache +ENTRYPOINT dotnet /jellyfin/jellyfin.dll \ + --datadir /config \ + --cachedir /cache \ + --ffmpeg /usr/bin/ffmpeg \ + --ffprobe /usr/bin/ffprobe |