From 9a16b7b0f661bf64076433d56133c56a7811918b Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pvizeli@syshack.ch>
Date: Thu, 22 Aug 2019 08:58:41 +0200
Subject: [PATCH] Update azure-pipelines-release.yml for Azure Pipelines
 (#26128)

* Update azure-pipelines-release.yml for Azure Pipelines

* Update azure-pipelines-release.yml
---
 azure-pipelines-release.yml | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/azure-pipelines-release.yml b/azure-pipelines-release.yml
index 81bb1944bed..d0cfc294db1 100644
--- a/azure-pipelines-release.yml
+++ b/azure-pipelines-release.yml
@@ -7,7 +7,7 @@ trigger:
 pr: none
 variables:
   - name: versionBuilder
-    value: '5.2'
+    value: '6.1'
   - group: docker
   - group: github
   - group: twine
@@ -155,48 +155,46 @@ stages:
       vmImage: 'ubuntu-latest'
     steps:
     - script: |
-        echo '{ "experimental": true }' | sudo tee /etc/docker/daemon.json
-        sudo service docker restart
+        mkdir -p ~/.docker
+        echo '{ "experimental": "enabled" }' > .docker/config.json
 
-        sleep 15
         sudo docker login -u $(dockerUser) -p $(dockerPassword)
       displayName: 'Enable manifest / Docker login'
     - script: |
         set -e
-        export DOCKER_CLI_EXPERIMENTAL=enabled
 
         function create_manifest() {
           local tag_l=$1
           local tag_r=$2
 
-          sudo docker manifest create homeassistant/home-assistant:${tag_l} \
+          sudo docker --config .docker manifest create homeassistant/home-assistant:${tag_l} \
             homeassistant/amd64-homeassistant:${tag_r} \
             homeassistant/i386-homeassistant:${tag_r} \
             homeassistant/armhf-homeassistant:${tag_r} \
             homeassistant/armv7-homeassistant:${tag_r} \
             homeassistant/aarch64-homeassistant:${tag_r}
 
-          sudo docker manifest annotate homeassistant/home-assistant:${tag_l} \
+          sudo docker --config .docker manifest annotate homeassistant/home-assistant:${tag_l} \
             homeassistant/amd64-homeassistant:${tag_r} \
             --os linux --arch amd64
 
-          sudo docker manifest annotate homeassistant/home-assistant:${tag_l} \
+          sudo docker --config .docker manifest annotate homeassistant/home-assistant:${tag_l} \
             homeassistant/i386-homeassistant:${tag_r} \
             --os linux --arch i386
 
-          sudo docker manifest annotate homeassistant/home-assistant:${tag_l} \
+          sudo docker --config .docker manifest annotate homeassistant/home-assistant:${tag_l} \
             homeassistant/armhf-homeassistant:${tag_r} \
             --os linux --arch arm --variant=v6
 
-          sudo docker manifest annotate homeassistant/home-assistant:${tag_l} \
+          sudo docker --config .docker manifest annotate homeassistant/home-assistant:${tag_l} \
             homeassistant/armv7-homeassistant:${tag_r} \
             --os linux --arch arm --variant=v7
 
-          sudo docker manifest annotate homeassistant/home-assistant:${tag_l} \
+          sudo docker --config .docker manifest annotate homeassistant/home-assistant:${tag_l} \
             homeassistant/aarch64-homeassistant:${tag_r} \
             --os linux --arch arm64 --variant=v8
 
-          sudo docker manifest push --purge homeassistant/home-assistant:${tag_l}
+          sudo docker --config .docker manifest push --purge homeassistant/home-assistant:${tag_l}
         }
 
         # Create version tag