From 38ec68c488c0c8e88989dc7c3fdc0824cfe71343 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20B=C3=BCttner?= <thomas@vergesslicher.tech>
Date: Sun, 24 Feb 2019 11:17:39 +0100
Subject: [PATCH] use common.build.sh for docker image builds
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Thomas Büttner <thomas@vergesslicher.tech>
---
 Dockerfile                 | 7 ++-----
 Dockerfile.arm             | 8 ++------
 Dockerfile.arm64           | 8 ++------
 deployment/common.build.sh | 3 +--
 4 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index af570ba655..3562688419 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,11 +4,8 @@ FROM microsoft/dotnet:${DOTNET_VERSION}-sdk as builder
 WORKDIR /repo
 COPY . .
 ENV DOTNET_CLI_TELEMETRY_OPTOUT=1
-RUN dotnet publish \
-    --configuration release \
-    --output /jellyfin \
-    "-p:GenerateDocumentationFile=false;DebugSymbols=false;DebugType=none" \
-    Jellyfin.Server
+RUN bash -c "source deployment/common.build.sh && \
+    build_jellyfin Jellyfin.Server Release linux-x64 /jellyfin"
 
 FROM jellyfin/ffmpeg as ffmpeg
 FROM microsoft/dotnet:${DOTNET_VERSION}-runtime
diff --git a/Dockerfile.arm b/Dockerfile.arm
index 9316245c50..69c5d446e8 100644
--- a/Dockerfile.arm
+++ b/Dockerfile.arm
@@ -17,12 +17,8 @@ RUN find . -type f -exec sed -i 's/netcoreapp2.1/netcoreapp3.0/g' {} \;
 # Discard objs - may cause failures if exists
 RUN find . -type d -name obj | xargs -r rm -r
 # Build
-RUN dotnet publish \
-    -r linux-arm \
-    --configuration release \
-    --output /jellyfin \
-    "-p:GenerateDocumentationFile=false;DebugSymbols=false;DebugType=none" \
-    Jellyfin.Server
+RUN bash -c "source deployment/common.build.sh && \
+    build_jellyfin Jellyfin.Server Release linux-arm /jellyfin"
 
 
 FROM microsoft/dotnet:${DOTNET_VERSION}-runtime-stretch-slim-arm32v7
diff --git a/Dockerfile.arm64 b/Dockerfile.arm64
index 5c67f85c9b..b85f8735bd 100644
--- a/Dockerfile.arm64
+++ b/Dockerfile.arm64
@@ -18,12 +18,8 @@ RUN find . -type f -exec sed -i 's/netcoreapp2.1/netcoreapp3.0/g' {} \;
 # Discard objs - may cause failures if exists
 RUN find . -type d -name obj | xargs -r rm -r
 # Build
-RUN dotnet publish \
-    -r linux-arm64 \
-    --configuration release \
-    --output /jellyfin \
-    "-p:GenerateDocumentationFile=false;DebugSymbols=false;DebugType=none" \
-    Jellyfin.Server
+RUN bash -c "source deployment/common.build.sh && \
+    build_jellyfin Jellyfin.Server Release linux-arm64 /jellyfin"
 
 
 FROM microsoft/dotnet:${DOTNET_VERSION}-runtime-stretch-slim-arm64v8
diff --git a/deployment/common.build.sh b/deployment/common.build.sh
index 5bffa1a732..d028e3a668 100755
--- a/deployment/common.build.sh
+++ b/deployment/common.build.sh
@@ -15,7 +15,6 @@ DEFAULT_CONFIG="Release"
 DEFAULT_OUTPUT_DIR="dist/jellyfin-git"
 DEFAULT_PKG_DIR="pkg-dist"
 DEFAULT_DOCKERFILE="Dockerfile"
-DEFAULT_IMAGE_TAG="jellyfin:"`git rev-parse --abbrev-ref HEAD`
 DEFAULT_ARCHIVE_CMD="tar -xvzf"
 
 # Parse the version from the AssemblyVersion
@@ -53,7 +52,7 @@ build_jellyfin_docker()
 (
     BUILD_CONTEXT=${1-$DEFAULT_BUILD_CONTEXT}
     DOCKERFILE=${2-$DEFAULT_DOCKERFILE}
-    IMAGE_TAG=${3-$DEFAULT_IMAGE_TAG}
+    IMAGE_TAG=${3-"jellyfin:$(git rev-parse --abbrev-ref HEAD)"}
 
     echo -e "${CYAN}Building jellyfin docker image in '${BUILD_CONTEXT}' with Dockerfile '${DOCKERFILE}' and tag '${IMAGE_TAG}'.${NC}"
     docker build -t ${IMAGE_TAG} -f ${DOCKERFILE} ${BUILD_CONTEXT}