diff options
| author | Andrew Rabert <6550543+nvllsvm@users.noreply.github.com> | 2019-02-16 01:34:37 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-16 01:34:37 -0500 |
| commit | c44f96b727c29b35eb64db295abe6ff3c86cb424 (patch) | |
| tree | 7aaad4a28f5fbc6b4877b4002448ba0653e807d1 /Dockerfile.arm | |
| parent | ff9a0c7e55573df45ea4d29d258149c0496abc51 (diff) | |
| parent | c5ac36c88686e7384d31d870ba35f4bbe8c38fdb (diff) | |
Merge pull request #909 from n8225/dockerBuilds
Fix docker arm builds
Diffstat (limited to 'Dockerfile.arm')
| -rw-r--r-- | Dockerfile.arm | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/Dockerfile.arm b/Dockerfile.arm index 039274197..0dc37a644 100644 --- a/Dockerfile.arm +++ b/Dockerfile.arm @@ -1,23 +1,30 @@ +# Requires binfm_misc registration for arm +# https://github.com/multiarch/qemu-user-static#binfmt_misc-register ARG DOTNET_VERSION=3.0 -FROM microsoft/dotnet:${DOTNET_VERSION}-sdk-stretch-arm32v7 as builder +FROM multiarch/qemu-user-static:x86_64-arm as qemu +FROM alpine as qemu_extract +COPY --from=qemu /usr/bin qemu-arm-static.tar.gz +RUN tar -xzvf qemu-arm-static.tar.gz + +FROM microsoft/dotnet:${DOTNET_VERSION}-sdk-stretch as builder WORKDIR /repo COPY . . #TODO Remove or update the sed line when we update dotnet version. RUN export DOTNET_CLI_TELEMETRY_OPTOUT=1 \ && find . -type f -exec sed -i 's/netcoreapp2.1/netcoreapp3.0/g' {} \; \ - && dotnet clean -maxcpucount:1 \ && dotnet publish \ - -maxcpucount:1 \ + -r linux-arm \ --configuration release \ --output /jellyfin \ Jellyfin.Server FROM microsoft/dotnet:${DOTNET_VERSION}-runtime-stretch-slim-arm32v7 +COPY --from=qemu_extract qemu-arm-static /usr/bin RUN apt-get update \ - && apt-get install -y ffmpeg + && apt-get install --no-install-recommends --no-install-suggests -y ffmpeg COPY --from=builder /jellyfin /jellyfin EXPOSE 8096 VOLUME /config /media |