From 6debff7b08f19500cbbd711f02abaf2cb83b564a Mon Sep 17 00:00:00 2001
From: eiximenis <etomas@gmail.com>
Date: Thu, 6 Jun 2019 16:41:14 +0200
Subject: [PATCH] fix docker credentials sharing between Docker@2 and bash
 activities in build

---
 build/azure-devops/multiarch.yaml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/build/azure-devops/multiarch.yaml b/build/azure-devops/multiarch.yaml
index f6684748b..3ee25f80e 100644
--- a/build/azure-devops/multiarch.yaml
+++ b/build/azure-devops/multiarch.yaml
@@ -6,10 +6,10 @@ parameters:
 
 jobs:
 - job: manifest
-  condition: and(succeeded(),ne('${{ variables['Build.Reason'] }}', 'PullRequest'))
-  dependsOn:
-    - BuildWindows
-    - BuildLinux  
+#  condition: and(succeeded(),ne('${{ variables['Build.Reason'] }}', 'PullRequest'))
+#  dependsOn:
+#    - BuildWindows
+#    - BuildLinux  
   pool: 
     vmImage: 'Ubuntu 16.04'
   steps:
@@ -21,7 +21,8 @@ jobs:
       dockerRegistryEndpoint: ${{ parameters.registryEndpoint }}
   - bash: |
       mkdir -p ~/.docker
-      echo '{ "experimental": "enabled" }' > ~/.docker/config.json
+      sed '$ s/.$//' $DOCKER_CONFIG/config.json > ~/.docker/config.json
+      echo ',"experimental": "enabled" }' >> ~/.docker/config.json
       docker --config ~/.docker manifest create ${{ parameters.registry }}/${{ parameters.image }}:${{ parameters.branch }} ${{ parameters.registry }}/${{ parameters.image }}:linux-${{ parameters.branch }} ${{ parameters.registry }}/${{ parameters.image }}:win-${{ parameters.branch }}
       docker --config ~/.docker manifest create ${{ parameters.registry }}/${{ parameters.image }}:latest ${{ parameters.registry }}/${{ parameters.image }}:linux-latest ${{ parameters.registry }}/${{ parameters.image }}:win-latest
       docker --config ~/.docker manifest push ${{ parameters.registry }}/${{ parameters.image }}:${{ parameters.branch }}