Added support for multi-platform public images

.gitignore

@@ -294,4 +294,7 @@ install-aso/
 *.Generated.*.cs
 
 # Azurite temporary files
-__*
+__*
+
+# For our Mac friends
+.DS_Store

build/build-image.yml

@@ -31,3 +31,4 @@ stages:
   - template: ./jobs/docker-build-all.yml
     parameters: 
       tag: $(build.BuildNumber)
+      buildPlatform: $(publicDockerImagePlatforms)

build/build-variables.yml

@@ -3,11 +3,12 @@
 
 variables:
   buildConfiguration: 'Release' 
+  publicDockerImagePlatforms: 'linux/amd64,linux/arm64'
+  testDockerImagePlatforms: 'linux/amd64'
   defaultBuildFramework: 'net8.0' 
   azureSubscriptionEndpoint: 'docker-build'
   azureContainerRegistryName: 'healthplatformregistry'
   azureContainerRegistry: '$(azureContainerRegistryName).azurecr.io'
-  composeLocation: 'build/docker/docker-compose.yaml'
   DeploymentEnvironmentNameSql: '$(DeploymentEnvironmentName)-sql'
   DeploymentEnvironmentNameR4: '$(DeploymentEnvironmentName)-r4'
   DeploymentEnvironmentNameR4Sql: '$(DeploymentEnvironmentNameR4)-sql'

build/ci-deploy.yml

@@ -32,6 +32,7 @@ stages:
   - template: ./jobs/docker-build-all.yml
     parameters: 
       tag: $(ImageTag)
+      buildPlatform: $(publicDockerImagePlatforms)
 
 - stage: provisionEnvironment
   displayName: Provision Environment

build/ci-pipeline.yml

@@ -117,6 +117,7 @@ stages:
   - template: ./jobs/docker-build-all.yml
     parameters: 
       tag: $(ImageTag)
+      buildPlatform: $(publicDockerImagePlatforms)
 
 # *********************** Stu3 ***********************
 - stage: redeployStu3

build/jobs/docker-build-all.yml

@@ -4,24 +4,30 @@
 parameters:
 - name: tag
   type: string
+- name: buildPlatform
+  type: string
 
-jobs:            
+jobs:
 - template: docker-build-push.yml
   parameters: 
     version: "R4"
     tag: ${{parameters.tag}}
+    buildPlatform: ${{parameters.buildPlatform}}
 
 - template: docker-build-push.yml
   parameters: 
     version: "R4B"
     tag: ${{parameters.tag}}
+    buildPlatform: ${{parameters.buildPlatform}}
 
 - template: docker-build-push.yml
   parameters: 
     version: "Stu3"
     tag: ${{parameters.tag}}
+    buildPlatform: ${{parameters.buildPlatform}}
 
 - template: docker-build-push.yml
   parameters: 
     version: "R5"
     tag: ${{parameters.tag}}
+    buildPlatform: ${{parameters.buildPlatform}}

build/jobs/docker-build-push.yml

@@ -6,35 +6,28 @@ parameters:
   type: string
 - name: tag
   type: string
+- name: buildPlatform
+  type: string
 
 jobs:
 - job: '${{parameters.version}}_Docker'
   pool:
     name: '$(DefaultLinuxPool)'
     vmImage: '$(LinuxVmImage)'
   steps:
-  - task: DockerCompose@0
+  - task: AzureCLI@2
     displayName: 'Build FHIR ${{parameters.version}} Server Image'
     inputs:
-      action: Build services
-      azureSubscriptionEndpoint: $(azureSubscriptionEndpoint)
-      azureContainerRegistry: $(azureContainerRegistry)
-      dockerComposeFile: $(composeLocation)
-      dockerComposeFileArgs: |
-        FHIR_VERSION=${{parameters.version}}
-        ASSEMBLY_VER=$(assemblySemFileVer)
-      projectName: ${{parameters.version}}
-      additionalImageTags: ${{parameters.tag}}
-
-  - task: DockerCompose@0
-    displayName: 'Push FHIR ${{parameters.version}} Server Image'
-    inputs:
-      action: Push services
-      azureSubscriptionEndpoint: $(azureSubscriptionEndpoint)
-      azureContainerRegistry: $(azureContainerRegistry)
-      dockerComposeFile: $(composeLocation)
-      dockerComposeFileArgs: |
-        FHIR_VERSION=${{parameters.version}}
-        ASSEMBLY_VER=$(assemblySemFileVer)
-      projectName: ${{parameters.version}}
-      additionalImageTags: ${{parameters.tag}}
+      azureSubscription: $(azureSubscriptionEndpoint)
+      scriptType: 'bash'
+      scriptLocation: 'inlineScript'
+      inlineScript: |
+        TAG="$(azureContainerRegistry)/${{parameters.version}}_fhir-server:${{parameters.tag}}"
+        az acr login --name $(azureContainerRegistryName)
+        docker buildx create --name fhir-multi-platform --platform ${{parameters.buildPlatform}} --use --bootstrap
+        docker buildx build --tag ${TAG,,} \
+                      --file ./build/docker/Dockerfile \
+                      --platform ${{parameters.buildPlatform}} \
+                      --build-arg FHIR_VERSION=${{parameters.version}} \
+                      --build-arg ASSEMBLY_VER=$(assemblySemFileVer) \
+                      --push .

build/pr-pipeline.yml

@@ -113,6 +113,7 @@ stages:
   - template: ./jobs/docker-build-all.yml
     parameters: 
       tag: $(ImageTag)
+      buildPlatform: $(testDockerImagePlatforms)
 
 - stage: provisionEnvironment
   displayName: Provision Environment