Fix dind test runner. Use official dind image

Author: macropin

tests/config.sh

@@ -6,5 +6,5 @@ MARIADB_IMAGE='mariadb'
 MARIADB_TAG='latest'
 MINIO_IMAGE='minio/minio'
 MINIO_TAG='latest'
-DIND_IMAGE='jpetazzo/dind'
-DIND_TAG='latest'
+DIND_IMAGE='docker'
+DIND_TAG='dind'

tests/dind-runner.sh

@@ -15,6 +15,7 @@ echo ">> Using Temp Dockerfile: $DOCKERFILE"
 
 cat << EOF > $DOCKERFILE
 FROM ${DIND_IMAGE}:${DIND_TAG}
+RUN apk add bash curl
 ADD .  /build/
 WORKDIR /build
 CMD ["/build/tests/runner.sh"]

tests/functions.sh

@@ -51,8 +51,8 @@ function wait_on_port {
 function start_docker {
     echo "=> Starting docker"
     if ! docker version > /dev/null 2>&1; then
-        wrapdocker > /dev/null 2>&1 &
-        sleep 5
+        dockerd-entrypoint.sh > /dev/null 2>&1 &
+        sleep 10
     fi
 }
 
@@ -63,7 +63,7 @@ function check_docker {
 
 function check_environment {
     echo "=> Testing environment"
-    docker version > /dev/null 
+    docker version > /dev/null
     which curl > /dev/null
 }
 

tests/runner.sh

@@ -10,6 +10,7 @@ CWD="$(dirname $0)/"
 
 echo "=> Starting $0"
 start_docker
+unset DOCKER_HOST # https://github.com/docker-library/docker/issues/200#issuecomment-550089770
 check_docker
 check_environment
 cleanup