aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErwin de Haan <EraYaN@users.noreply.github.com>2019-01-12 15:54:52 +0100
committerErwin de Haan <EraYaN@users.noreply.github.com>2019-01-12 15:54:52 +0100
commitba671569b4a5f897c10b209d9e33fafca0e8621f (patch)
tree42a60856f95e383ea502590336f4347661f7589f
parent2c65fe53f264f120b5ed028cc81df629e0e6a3bc (diff)
Moved main docker file.
-rw-r--r--Dockerfile (renamed from deployment/docker/Dockerfile.amd64)0
-rwxr-xr-xdeployment/docker/build.sh2
2 files changed, 1 insertions, 1 deletions
diff --git a/deployment/docker/Dockerfile.amd64 b/Dockerfile
index 62f8e4fa4..62f8e4fa4 100644
--- a/deployment/docker/Dockerfile.amd64
+++ b/Dockerfile
diff --git a/deployment/docker/build.sh b/deployment/docker/build.sh
index 40cf90d28..783ebe1e3 100755
--- a/deployment/docker/build.sh
+++ b/deployment/docker/build.sh
@@ -4,7 +4,7 @@ source ../common.build.sh
VERSION=`get_version ../..`
-build_jellyfin_docker ../.. Dockerfile.amd64 jellyfin:amd64-${VERSION}
+build_jellyfin_docker ../.. ../../Dockerfile jellyfin:amd64-${VERSION}
build_jellyfin_docker ../.. Dockerfile.arm64v8 jellyfin:arm64v8-${VERSION} arm64v8