Update arm/arm64 images to build cross-platform
These Dockerfiles can not be built natively - must be built on x86_64
This commit is contained in:
parent
edcfd8b565
commit
a5aa482b6c
|
@ -1,6 +1,8 @@
|
||||||
.git
|
.git
|
||||||
.dockerignore
|
.dockerignore
|
||||||
Dockerfile
|
Dockerfile
|
||||||
|
Dockerfile.arm
|
||||||
|
Dockerfile.arm64
|
||||||
CONTRIBUTORS.md
|
CONTRIBUTORS.md
|
||||||
README.md
|
README.md
|
||||||
deployment/*/dist
|
deployment/*/dist
|
||||||
|
|
|
@ -1,18 +1,28 @@
|
||||||
ARG DOTNET_VERSION=3.0
|
ARG DOTNET_VERSION=2.2
|
||||||
|
|
||||||
FROM microsoft/dotnet:${DOTNET_VERSION}-sdk as builder
|
|
||||||
|
FROM multiarch/qemu-user-static:x86_64-arm as qemu
|
||||||
|
FROM alpine as qemu_extract
|
||||||
|
COPY --from=qemu /usr/bin qemu_user_static.tgz
|
||||||
|
RUN tar -xzvf qemu_user_static.tgz
|
||||||
|
|
||||||
|
|
||||||
|
FROM microsoft/dotnet:${DOTNET_VERSION}-sdk-stretch-arm32v7 as builder
|
||||||
|
COPY --from=qemu_extract qemu-* /usr/bin
|
||||||
WORKDIR /repo
|
WORKDIR /repo
|
||||||
COPY . .
|
COPY . .
|
||||||
#TODO Remove or update the sed line when we update dotnet version.
|
#TODO Remove or update the sed line when we update dotnet version.
|
||||||
RUN export DOTNET_CLI_TELEMETRY_OPTOUT=1 \
|
RUN export DOTNET_CLI_TELEMETRY_OPTOUT=1 \
|
||||||
&& find . -type f -exec sed -i 's/netcoreapp2.1/netcoreapp3.0/g' {} \; \
|
&& dotnet clean -maxcpucount:1 \
|
||||||
&& dotnet clean \
|
|
||||||
&& dotnet publish \
|
&& dotnet publish \
|
||||||
|
-maxcpucount:1 \
|
||||||
--configuration release \
|
--configuration release \
|
||||||
--output /jellyfin \
|
--output /jellyfin \
|
||||||
Jellyfin.Server
|
Jellyfin.Server
|
||||||
|
|
||||||
FROM microsoft/dotnet:${DOTNET_VERSION}-runtime
|
|
||||||
|
FROM microsoft/dotnet:${DOTNET_VERSION}-runtime-stretch-slim-arm32v7
|
||||||
|
COPY --from=qemu_extract qemu-* /usr/bin
|
||||||
COPY --from=builder /jellyfin /jellyfin
|
COPY --from=builder /jellyfin /jellyfin
|
||||||
EXPOSE 8096
|
EXPOSE 8096
|
||||||
RUN apt-get update \
|
RUN apt-get update \
|
||||||
|
|
31
Dockerfile.arm64
Normal file
31
Dockerfile.arm64
Normal file
|
@ -0,0 +1,31 @@
|
||||||
|
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
|
||||||
|
|
||||||
|
|
||||||
|
FROM microsoft/dotnet:${DOTNET_VERSION}-sdk-stretch-arm64v8 as builder
|
||||||
|
COPY --from=qemu_extract qemu-* /usr/bin
|
||||||
|
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 \
|
||||||
|
--configuration release \
|
||||||
|
--output /jellyfin \
|
||||||
|
Jellyfin.Server
|
||||||
|
|
||||||
|
|
||||||
|
FROM microsoft/dotnet:${DOTNET_VERSION}-runtime-stretch-slim-arm64v8
|
||||||
|
COPY --from=qemu_extract qemu-* /usr/bin
|
||||||
|
COPY --from=builder /jellyfin /jellyfin
|
||||||
|
EXPOSE 8096
|
||||||
|
RUN apt-get update \
|
||||||
|
&& apt-get install -y ffmpeg
|
||||||
|
VOLUME /config /media
|
||||||
|
ENTRYPOINT dotnet /jellyfin/jellyfin.dll -programdata /config
|
Loading…
Reference in New Issue
Block a user