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.arm64 | |
| parent | ff9a0c7e55573df45ea4d29d258149c0496abc51 (diff) | |
| parent | c5ac36c88686e7384d31d870ba35f4bbe8c38fdb (diff) | |
Merge pull request #909 from n8225/dockerBuilds
Fix docker arm builds
Diffstat (limited to 'Dockerfile.arm64')
| -rw-r--r-- | Dockerfile.arm64 | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index 06ba21b91..ec42610c0 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -5,28 +5,27 @@ ARG DOTNET_VERSION=3.0 FROM multiarch/qemu-user-static:x86_64-aarch64 as qemu FROM alpine as qemu_extract -COPY --from=qemu /usr/bin qemu_user_static.tgz -RUN tar -xzvf qemu_user_static.tgz +COPY --from=qemu /usr/bin qemu-aarch64-static.tar.gz +RUN tar -xzvf qemu-aarch64-static.tar.gz -FROM microsoft/dotnet:${DOTNET_VERSION}-sdk-stretch-arm64v8 as builder -COPY --from=qemu_extract qemu-* /usr/bin +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 \ && dotnet publish \ + -r linux-arm64 \ --configuration release \ --output /jellyfin \ Jellyfin.Server FROM microsoft/dotnet:${DOTNET_VERSION}-runtime-stretch-slim-arm64v8 +COPY --from=qemu_extract qemu-aarch64-static /usr/bin RUN apt-get update \ - && apt-get install -y ffmpeg -COPY --from=qemu_extract qemu-* /usr/bin + && apt-get install --no-install-recommends --no-install-suggests -y ffmpeg COPY --from=builder /jellyfin /jellyfin EXPOSE 8096 VOLUME /config /media |