From d7b7be395b76c7fcc49d3baffeb59d51a9b36378 Mon Sep 17 00:00:00 2001
From: Erwin de Haan <EraYaN@users.noreply.github.com>
Date: Sun, 13 Jan 2019 23:24:43 +0100
Subject: Moved ARM dockerfiles back to root.

---
 deployment/docker/Dockerfile.arm32v7 | 18 ------------------
 deployment/docker/Dockerfile.arm64v8 | 18 ------------------
 deployment/docker/build.sh           |  4 ++--
 3 files changed, 2 insertions(+), 38 deletions(-)
 delete mode 100644 deployment/docker/Dockerfile.arm32v7
 delete mode 100644 deployment/docker/Dockerfile.arm64v8

(limited to 'deployment/docker')

diff --git a/deployment/docker/Dockerfile.arm32v7 b/deployment/docker/Dockerfile.arm32v7
deleted file mode 100644
index 816b662aa..000000000
--- a/deployment/docker/Dockerfile.arm32v7
+++ /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-arm32v7
-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/Dockerfile.arm64v8 b/deployment/docker/Dockerfile.arm64v8
deleted file mode 100644
index 932b50391..000000000
--- a/deployment/docker/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 d59854415..0f617ad09 100755
--- a/deployment/docker/build.sh
+++ b/deployment/docker/build.sh
@@ -6,6 +6,6 @@ VERSION=`get_version ../..`
 
 build_jellyfin_docker ../.. ../../Dockerfile jellyfin:amd64-${VERSION}
 
-build_jellyfin_docker ../.. Dockerfile.arm64v8 jellyfin:arm64v8-${VERSION} arm64v8
+build_jellyfin_docker ../.. ../../Dockerfile.arm64v8 jellyfin:arm64v8-${VERSION} arm64v8
 
-build_jellyfin_docker ../.. Dockerfile.arm32v7 jellyfin:arm32v7-${VERSION} arm32v7
+build_jellyfin_docker ../.. ../../Dockerfile.arm32v7 jellyfin:arm32v7-${VERSION} arm32v7
-- 
cgit v1.2.3