Use docker manifest command from edge channel

travis-build.sh

@@ -6,6 +6,9 @@ uname -a
 echo "Updating Docker engine to have multi-stage builds"
 sudo service docker stop
 curl -fsSL https://get.docker.com/ | sudo sh
+echo "Enabling docker client experimental features"
+mkdir -p ~/.docker
+echo '{ "experimental": "enabled" }' > ~/.docker/config.json
 docker version
 
 if [ -d tmp ]; then

travis-deploy.sh

@@ -30,33 +30,27 @@ if [ "$ARCH" == "amd64" ]; then
   done
   set -e
 
-  echo "Downloading docker client with manifest command"
-  wget https://6582-88013053-gh.circle-artifacts.com/1/work/build/docker-linux-amd64
-  mv docker-linux-amd64 docker
-  chmod +x docker
-  ./docker version
-
   set -x
 
   echo "Pushing manifest $image:$TRAVIS_TAG"
-  ./docker -D manifest create "$image:$TRAVIS_TAG" \
+  docker -D manifest create "$image:$TRAVIS_TAG" \
     "$image:linux-amd64-$TRAVIS_TAG" \
     "$image:linux-arm-$TRAVIS_TAG" \
     "$image:linux-arm64-$TRAVIS_TAG" \
     "$image:windows-amd64-$TRAVIS_TAG" \
     "$image:windows-amd64-$TRAVIS_TAG-1709"
-  ./docker manifest annotate "$image:$TRAVIS_TAG" "$image:linux-arm-$TRAVIS_TAG" --os linux --arch arm --variant v6
-  ./docker manifest annotate "$image:$TRAVIS_TAG" "$image:linux-arm64-$TRAVIS_TAG" --os linux --arch arm64 --variant v8
-  ./docker manifest push "$image:$TRAVIS_TAG"
+  docker manifest annotate "$image:$TRAVIS_TAG" "$image:linux-arm-$TRAVIS_TAG" --os linux --arch arm --variant v6
+  docker manifest annotate "$image:$TRAVIS_TAG" "$image:linux-arm64-$TRAVIS_TAG" --os linux --arch arm64 --variant v8
+  docker manifest push "$image:$TRAVIS_TAG"
 
   echo "Pushing manifest $image:latest"
-  ./docker -D manifest create "$image:latest" \
+  docker -D manifest create "$image:latest" \
     "$image:linux-amd64-$TRAVIS_TAG" \
     "$image:linux-arm-$TRAVIS_TAG" \
     "$image:linux-arm64-$TRAVIS_TAG" \
     "$image:windows-amd64-$TRAVIS_TAG" \
     "$image:windows-amd64-$TRAVIS_TAG-1709"
-  ./docker manifest annotate "$image:latest" "$image:linux-arm-$TRAVIS_TAG" --os linux --arch arm --variant v6
-  ./docker manifest annotate "$image:latest" "$image:linux-arm64-$TRAVIS_TAG" --os linux --arch arm64 --variant v8
-  ./docker manifest push "$image:latest"
+  docker manifest annotate "$image:latest" "$image:linux-arm-$TRAVIS_TAG" --os linux --arch arm --variant v6
+  docker manifest annotate "$image:latest" "$image:linux-arm64-$TRAVIS_TAG" --os linux --arch arm64 --variant v8
+  docker manifest push "$image:latest"
 fi