From 9b224d7080d0dce986937229e9ff0c8923f7ce95 Mon Sep 17 00:00:00 2001
From: Erwin de Haan <EraYaN@users.noreply.github.com>
Date: Sun, 13 Jan 2019 23:43:12 +0100
Subject: [PATCH] Merged the two ARM platforms. To be split apart when a binary
 ffmpeg is required.

---
 Dockerfile.arm32v7 => Dockerfile.arm |  2 +-
 Dockerfile.arm64v8                   | 18 ------------------
 deployment/docker/build.sh           |  5 +++--
 deployment/docker/package.sh         |  6 +++---
 4 files changed, 7 insertions(+), 24 deletions(-)
 rename Dockerfile.arm32v7 => Dockerfile.arm (89%)
 delete mode 100644 Dockerfile.arm64v8

diff --git a/Dockerfile.arm32v7 b/Dockerfile.arm
similarity index 89%
rename from Dockerfile.arm32v7
rename to Dockerfile.arm
index fd9dc6c15..a0b3d0e1d 100644
--- a/Dockerfile.arm32v7
+++ b/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 \
diff --git a/Dockerfile.arm64v8 b/Dockerfile.arm64v8
deleted file mode 100644
index 932b50391..000000000
--- a/Dockerfile.arm64v8
+++ /dev/null
@@ -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
diff --git a/deployment/docker/build.sh b/deployment/docker/build.sh
index 0f617ad09..444208c85 100755
--- a/deployment/docker/build.sh
+++ b/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}
diff --git a/deployment/docker/package.sh b/deployment/docker/package.sh
index 402ac1355..d74426e2f 100755
--- a/deployment/docker/package.sh
+++ b/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:arm64v8-${VERSION} --os linux --arch arm64 --variant armv8
+#docker manifest annotate jellyfin:arm32v7-${VERSION} --os linux --arch arm --variant armv7
+#docker manifest annotate jellyfin:arm64v8-${VERSION} --os linux --arch arm64 --variant armv8
 
-#TODO publish.sh - docker manifest push jellyfin:${VERSION}
\ No newline at end of file
+#TODO publish.sh - docker manifest push jellyfin:${VERSION}