Merged the two ARM platforms. To be split apart when a binary ffmpeg is required.

Dockerfile.arm

@@ -12,7 +12,7 @@ RUN export DOTNET_CLI_TELEMETRY_OPTOUT=1 \
     --output /jellyfin \
     Jellyfin.Server
 
-FROM microsoft/dotnet:${DOTNET_VERSION}-runtime-stretch-slim-arm32v7
+FROM microsoft/dotnet:${DOTNET_VERSION}-runtime
 COPY --from=builder /jellyfin /jellyfin
 EXPOSE 8096
 RUN apt-get update \

Dockerfile.arm64v8

@@ -1,18 +0,0 @@
-ARG DOTNET_VERSION=3.0
-
-FROM microsoft/dotnet:${DOTNET_VERSION}-sdk 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 --configuration release --output /jellyfin Jellyfin.Server
-
-FROM microsoft/dotnet:${DOTNET_VERSION}-runtime-stretch-slim-arm64v8
-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

deployment/docker/build.sh

@@ -6,6 +6,7 @@ VERSION=`get_version ../..`
 
 build_jellyfin_docker ../.. ../../Dockerfile jellyfin:amd64-${VERSION}
 
-build_jellyfin_docker ../.. ../../Dockerfile.arm64v8 jellyfin:arm64v8-${VERSION} arm64v8
+build_jellyfin_docker ../.. ../../Dockerfile.arm jellyfin:arm-${VERSION}
 
-build_jellyfin_docker ../.. ../../Dockerfile.arm32v7 jellyfin:arm32v7-${VERSION} arm32v7
+#build_jellyfin_docker ../.. ../../Dockerfile.arm64v8 jellyfin:arm64v8-${VERSION}
+#build_jellyfin_docker ../.. ../../Dockerfile.arm32v7 jellyfin:arm32v7-${VERSION}

deployment/docker/package.sh

@@ -6,7 +6,7 @@ VERSION=`get_version ../..`
 
 docker manifest create jellyfin:${VERSION} jellyfin:amd64-${VERSION} jellyfin:arm32v7-${VERSION} jellyfin:arm64v8-${VERSION}
 docker manifest annotate jellyfin:amd64-${VERSION} --os linux --arch amd64
-docker manifest annotate jellyfin:arm32v7-${VERSION} --os linux --arch arm --variant armv7
+#docker manifest annotate jellyfin:arm32v7-${VERSION} --os linux --arch arm --variant armv7
-docker manifest annotate jellyfin:arm64v8-${VERSION} --os linux --arch arm64 --variant armv8
+#docker manifest annotate jellyfin:arm64v8-${VERSION} --os linux --arch arm64 --variant armv8
 
-#TODO publish.sh - docker manifest push jellyfin:${VERSION}
+#TODO publish.sh - docker manifest push jellyfin:${VERSION}