Merge branch 'master' of github.com:StefanScherer/whoami

* 'master' of github.com:StefanScherer/whoami:
  Remove docker manifest -D debug option
  Remove Docker 17.05 CE, AppVeyor already has 17.06 EE
  Test with circle build 5028

appveyor-build.ps1

@@ -5,17 +5,6 @@ Write-Host Starting build
 Write-Host Updating base images
 docker pull microsoft/nanoserver
 
-docker version
-Write-Host Updating Docker engine to master
-Stop-Service docker
-$version = "17.05.0-ce"
-$wc = New-Object net.webclient
-$wc.DownloadFile("https://get.docker.com/builds/Windows/x86_64/docker-$version.zip", "$env:TEMP\docker.zip")
-Expand-Archive -Path "$env:TEMP\docker.zip" -DestinationPath $env:ProgramFiles -Force
-Remove-Item "$env:TEMP\docker.zip"
-Start-Service docker
-docker version
-
 docker build -t whoami -f Dockerfile.windows .
 
 docker images

travis-deploy.sh

@@ -26,7 +26,7 @@ if [ "$ARCH" == "amd64" ]; then
   set -e
 
   echo "Downloading docker client with manifest command"
-  wget https://4292-88013053-gh.circle-artifacts.com/1/work/build/docker-linux-amd64
+  wget https://5028-88013053-gh.circle-artifacts.com/1/work/build/docker-linux-amd64
   mv docker-linux-amd64 docker
   chmod +x docker
   ./docker version
@@ -41,7 +41,7 @@ if [ "$ARCH" == "amd64" ]; then
     "$image:windows-amd64-$TRAVIS_TAG"
   ./docker manifest annotate "$image:$TRAVIS_TAG" "$image:linux-arm-$TRAVIS_TAG" --os linux --arch arm
   ./docker manifest annotate "$image:$TRAVIS_TAG" "$image:linux-arm64-$TRAVIS_TAG" --os linux --arch arm64
-  ./docker -D manifest push "$image:$TRAVIS_TAG"
+  ./docker manifest push "$image:$TRAVIS_TAG"
 
   echo "Pushing manifest $image:latest"
   ./docker -D manifest create "$image:latest" \
@@ -51,5 +51,5 @@ if [ "$ARCH" == "amd64" ]; then
     "$image:windows-amd64-$TRAVIS_TAG"
   ./docker manifest annotate "$image:latest" "$image:linux-arm-$TRAVIS_TAG" --os linux --arch arm
   ./docker manifest annotate "$image:latest" "$image:linux-arm64-$TRAVIS_TAG" --os linux --arch arm64
-  ./docker manifest -D push "$image:latest"
+  ./docker manifest push "$image:latest"
 fi