diff options
| author | Andrew Rabert <ar@nullsum.net> | 2020-02-13 20:03:40 -0500 |
|---|---|---|
| committer | Andrew Rabert <ar@nullsum.net> | 2020-02-13 20:03:40 -0500 |
| commit | dcac99c1a462800ae7f25b6cf4925aecc37c4e02 (patch) | |
| tree | 9ca479a19fd5919dc3a9fdf0286eb0ca380bd7c8 | |
| parent | cf2626428c0d4755662855fe6c3e4f439c909de9 (diff) | |
Fix arm32 built on amd64 host
dotnet doesn't support building arm32 from QEMU (fuck knows why).
also change arm64 image for the sake of consistency
| -rw-r--r-- | Dockerfile.arm | 8 | ||||
| -rw-r--r-- | Dockerfile.arm64 | 9 |
2 files changed, 14 insertions, 3 deletions
diff --git a/Dockerfile.arm b/Dockerfile.arm index 5151d4cb6..5847de918 100644 --- a/Dockerfile.arm +++ b/Dockerfile.arm @@ -1,3 +1,7 @@ +# DESIGNED FOR BUILDING ON AMD64 ONLY +##################################### +# Requires binfm_misc registration +# https://github.com/multiarch/qemu-user-static#binfmt_misc-register ARG DOTNET_VERSION=3.1 @@ -21,7 +25,9 @@ RUN find . -type d -name obj | xargs -r rm -r RUN dotnet publish Jellyfin.Server --configuration Release --output="/jellyfin" --self-contained --runtime linux-arm "-p:GenerateDocumentationFile=false;DebugSymbols=false;DebugType=none" -FROM debian:buster-slim +FROM multiarch/qemu-user-static:x86_64-arm as qemu +FROM arm32v7/debian:buster-slim +COPY --from=qemu /usr/bin/qemu-arm-static /usr/bin RUN apt-get update \ && apt-get install --no-install-recommends --no-install-suggests -y ffmpeg \ libssl-dev ca-certificates \ diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index bf9604bbf..a9f6c50d9 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -1,3 +1,7 @@ +# DESIGNED FOR BUILDING ON AMD64 ONLY +##################################### +# Requires binfm_misc registration +# https://github.com/multiarch/qemu-user-static#binfmt_misc-register ARG DOTNET_VERSION=3.1 @@ -20,8 +24,9 @@ RUN find . -type d -name obj | xargs -r rm -r # Build RUN dotnet publish Jellyfin.Server --configuration Release --output="/jellyfin" --self-contained --runtime linux-arm64 "-p:GenerateDocumentationFile=false;DebugSymbols=false;DebugType=none" - -FROM debian:buster-slim +FROM multiarch/qemu-user-static:x86_64-aarch64 as qemu +FROM arm64v8/debian:buster-slim +COPY --from=qemu /usr/bin/qemu-aarch64-static /usr/bin RUN apt-get update \ && apt-get install --no-install-recommends --no-install-suggests -y ffmpeg \ libssl-dev ca-certificates \ |