From 7b1190cb28bc1a423068a23303ff43f30b3c47ed Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Fri, 19 Jun 2020 17:20:48 -0400
Subject: [PATCH] Build builder docker images in Azure

---
 .ci/azure-pipelines-package.yml | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/.ci/azure-pipelines-package.yml b/.ci/azure-pipelines-package.yml
index 2189cc94a1..fbbbeb158e 100644
--- a/.ci/azure-pipelines-package.yml
+++ b/.ci/azure-pipelines-package.yml
@@ -64,6 +64,15 @@ jobs:
 - job: BuildDocker
   displayName: 'Build Docker'
 
+  strategy:
+    matrix:
+      Docker.amd64:
+        BuildConfiguration: amd64
+      Docker.arm64:
+        BuildConfiguration: arm64
+      Docker.armhf:
+        BuildConfiguration: armhf
+
   pool:
     vmImage: 'ubuntu-latest'
 
@@ -75,11 +84,11 @@ jobs:
       repository: 'jellyfin/jellyfin-server'
       command: buildAndPush
       buildContext: '.'
-      Dockerfile: 'deployment/Dockerfile.docker'
+      Dockerfile: 'deployment/Dockerfile.docker.$(BuildConfiguration)'
       containerRegistry: Docker Hub
       tags: |
-        unstable-$(Build.BuildNumber)
-        unstable
+        unstable-$(Build.BuildNumber)-$(BuildConfiguration)
+        unstable-$(BuildConfiguration)
 
   - task: Docker@2
     displayName: 'Push Stable Image'
@@ -88,11 +97,11 @@ jobs:
       repository: 'jellyfin/jellyfin-server'
       command: buildAndPush
       buildContext: '.'
-      Dockerfile: 'deployment/Dockerfile.docker'
+      Dockerfile: 'deployment/Dockerfile.docker.$(BuildConfiguration)'
       containerRegistry: Docker Hub
       tags: |
-        stable-$(Build.BuildNumber)
-        stable
+        stable-$(Build.BuildNumber)-$(BuildConfiguration)
+        stable-$(BuildConfiguration)
 
 - job: CollectArtifacts
   displayName: 'Collect Artifacts'