Merge branch 'master' into 1.28.x

script/test/all

@@ -38,17 +38,19 @@ for version in $DOCKER_VERSIONS; do
 
   trap "on_exit" EXIT
 
-  repo="dockerswarm/dind"
-
   docker run \
     -d \
     --name "$daemon_container" \
     --privileged \
     --volume="/var/lib/docker" \
-    "$repo:$version" \
+    -v $DOCKER_CONFIG/config.json:/code/.docker/config.json \
+    -e "DOCKER_TLS_CERTDIR=" \
+    "docker:$version-dind" \
     dockerd -H tcp://0.0.0.0:2375 $DOCKER_DAEMON_ARGS \
     2>&1 | tail -n 10
 
+  docker exec "$daemon_container" sh -c "apk add --no-cache git"
+
   docker run \
     --rm \
     --tty \