浏览代码

Build builder docker images in Azure

Joshua M. Boniface 5 年之前
父节点
当前提交
7b1190cb28
共有 1 个文件被更改,包括 15 次插入6 次删除
  1. 15 6
      .ci/azure-pipelines-package.yml

+ 15 - 6
.ci/azure-pipelines-package.yml

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