From 1da56f8b2bc7def56515036122b04b56e70a8d6e Mon Sep 17 00:00:00 2001 From: Miguel Veloso Date: Fri, 24 Jan 2020 14:03:30 +0100 Subject: [PATCH 1/3] Diferentiate displayNames --- build/azure-devops/buildimages.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build/azure-devops/buildimages.yaml b/build/azure-devops/buildimages.yaml index bdd326de1..f382b18b6 100644 --- a/build/azure-devops/buildimages.yaml +++ b/build/azure-devops/buildimages.yaml @@ -11,7 +11,7 @@ jobs: vmImage: 'ubuntu-16.04' steps: - bash: docker-compose build ${{ parameters.services }} - displayName: Create multiarch manifest + displayName: Create multiarch manifest (BuildContainersForPR_Linux) env: TAG: ${{ variables['Build.SourceBranchName'] }} - job: BuildContainersForPR_Windows @@ -21,7 +21,7 @@ jobs: vmImage: 'windows-2019' steps: - bash: docker-compose build ${{ parameters.services }} - displayName: Create multiarch manifest + displayName: Create multiarch manifest (BuildContainersForPR_Windows) env: TAG: ${{ variables['Build.SourceBranchName'] }} PLATFORM: win @@ -32,7 +32,7 @@ jobs: vmImage: 'ubuntu-16.04' steps: - task: DockerCompose@0 - displayName: Compose build ${{ parameters.services }} + displayName: Compose build ${{ parameters.services }} (BuildLinux) inputs: dockerComposeCommand: 'build ${{ parameters.services }}' containerregistrytype: Container Registry @@ -68,7 +68,7 @@ jobs: vmImage: 'windows-2019' steps: - task: DockerCompose@0 - displayName: Compose build ${{ parameters.services }} + displayName: Compose build ${{ parameters.services }} (BuildWindows) inputs: dockerComposeCommand: 'build ${{ parameters.services }}' containerregistrytype: Container Registry From 0dbf2f8c7cfaa27909d241eb5e95bef865101c9d Mon Sep 17 00:00:00 2001 From: Miguel Veloso Date: Fri, 24 Jan 2020 14:27:35 +0100 Subject: [PATCH 2/3] Add project-directory param for compose --- build/azure-devops/buildimages.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build/azure-devops/buildimages.yaml b/build/azure-devops/buildimages.yaml index f382b18b6..9b0df50ca 100644 --- a/build/azure-devops/buildimages.yaml +++ b/build/azure-devops/buildimages.yaml @@ -10,8 +10,8 @@ jobs: pool: vmImage: 'ubuntu-16.04' steps: - - bash: docker-compose build ${{ parameters.services }} - displayName: Create multiarch manifest (BuildContainersForPR_Linux) + - bash: docker-compose --project-directory ./src build ${{ parameters.services }} + displayName: Compose build ${{ parameters.services }} env: TAG: ${{ variables['Build.SourceBranchName'] }} - job: BuildContainersForPR_Windows @@ -20,8 +20,8 @@ jobs: pool: vmImage: 'windows-2019' steps: - - bash: docker-compose build ${{ parameters.services }} - displayName: Create multiarch manifest (BuildContainersForPR_Windows) + - bash: docker-compose --project-directory ./src build ${{ parameters.services }} + displayName: Compose build ${{ parameters.services }} env: TAG: ${{ variables['Build.SourceBranchName'] }} PLATFORM: win @@ -32,7 +32,7 @@ jobs: vmImage: 'ubuntu-16.04' steps: - task: DockerCompose@0 - displayName: Compose build ${{ parameters.services }} (BuildLinux) + displayName: Compose build ${{ parameters.services }} inputs: dockerComposeCommand: 'build ${{ parameters.services }}' containerregistrytype: Container Registry @@ -68,7 +68,7 @@ jobs: vmImage: 'windows-2019' steps: - task: DockerCompose@0 - displayName: Compose build ${{ parameters.services }} (BuildWindows) + displayName: Compose build ${{ parameters.services }} inputs: dockerComposeCommand: 'build ${{ parameters.services }}' containerregistrytype: Container Registry From fd382d57af2ded7950befba3080d9cc9115eca84 Mon Sep 17 00:00:00 2001 From: Miguel Veloso Date: Fri, 24 Jan 2020 14:36:20 +0100 Subject: [PATCH 3/3] Add -f parameter --- build/azure-devops/buildimages.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/azure-devops/buildimages.yaml b/build/azure-devops/buildimages.yaml index 9b0df50ca..2e58cad21 100644 --- a/build/azure-devops/buildimages.yaml +++ b/build/azure-devops/buildimages.yaml @@ -10,7 +10,7 @@ jobs: pool: vmImage: 'ubuntu-16.04' steps: - - bash: docker-compose --project-directory ./src build ${{ parameters.services }} + - bash: docker-compose -f src/docker-compose.yml build ${{ parameters.services }} displayName: Compose build ${{ parameters.services }} env: TAG: ${{ variables['Build.SourceBranchName'] }} @@ -20,7 +20,7 @@ jobs: pool: vmImage: 'windows-2019' steps: - - bash: docker-compose --project-directory ./src build ${{ parameters.services }} + - bash: docker-compose f src/docker-compose.yml build ${{ parameters.services }} displayName: Compose build ${{ parameters.services }} env: TAG: ${{ variables['Build.SourceBranchName'] }}