Update tests to run on multi-arch and use official docker:dind

Author: macropin

tests/config.sh

@@ -6,5 +6,5 @@ MONGODB_IMAGE='mongo'
 MONGODB_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,16 +15,19 @@ echo ">> Using Temp Dockerfile: $DOCKERFILE"
 
 cat << EOF > $DOCKERFILE
 FROM ${DIND_IMAGE}:${DIND_TAG}
+ENV DOCKER_HOST='unix:///var/run/docker.sock'
+RUN apk add bash
 ADD .  /build/
 WORKDIR /build
+ENTRYPOINT ["/bin/bash"]
 CMD ["/build/tests/runner.sh"]
 EOF
 
 echo ">> Building"
 docker build -f $DOCKERFILE -t $TEST_CONTAINER .
 
 echo ">> Running"
-docker run --privileged -ti --rm $TEST_CONTAINER
+docker run --platform ${PLATFORM} --privileged -ti --rm $TEST_CONTAINER
 
 echo ">> Removing"
 docker rmi $TEST_CONTAINER

tests/functions.sh

@@ -8,6 +8,19 @@ CWD="$(dirname $0)/"
 
 . ${CWD}config.sh
 
+# Set docker platform
+case $(uname -m) in
+    x86_64)
+        PLATFORM="linux/amd64"
+        ;;
+    aarch64|arm64)
+        PLATFORM="linux/arm64/v8"
+        ;;
+    *)
+        PLATFORM="linux/$(uname -m)"
+        ;;
+esac
+
 function rm_container {
     set +e
     docker rm -fv "$@" > /dev/null 2>&1
@@ -50,10 +63,12 @@ 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
-    fi
+    dockerd-entrypoint.sh dockerd > /dev/null 2>&1 &
+    while (! docker stats --no-stream &> /dev/null); do
+        echo "Waiting for Docker daemon..."
+        sleep 1
+    done
+    echo "Docker daemon is ready."
 }
 
 function check_docker {
@@ -62,9 +77,8 @@ function check_docker {
 }
 
 function check_environment {
-    echo "=> Testing environment"
-    docker version > /dev/null 
-    which curl > /dev/null
+    echo "=> Checking environment"
+    docker version > /dev/null || { echo "docker bad"; exit 1; }
 }
 
 function build_image {

tests/test.sh

@@ -9,20 +9,20 @@ CWD="$(dirname $0)/"
 . ${CWD}functions.sh
 
 echo "=> Test save command"
-docker run -d --name mongodb -p 27017:27017 ${MONGODB_IMAGE}:${MONGODB_TAG} > /dev/null
-docker run -d --name minio -p 9000:9000 ${MINIO_IMAGE}:${MINIO_TAG} server /data > /dev/null
-docker run --rm -i --link minio -e MC_HOST_minio=http://minioadmin:minioadmin@minio:9000 minio/mc:latest --quiet mb minio/backup
-docker run -i --name $TEST_NAME --link mongodb --link minio -e AWS_ACCESS_KEY_ID=minioadmin -e AWS_SECRET_ACCESS_KEY=minioadmin -e AWS_S3_ADDITIONAL_ARGS="--endpoint-url http://minio:9000" $TEST_CONTAINER save --host mongodb s3://backup
+docker run --platform ${PLATFORM} -d --name mongodb -p 27017:27017 ${MONGODB_IMAGE}:${MONGODB_TAG} > /dev/null
+docker run --platform ${PLATFORM} -d --name minio -p 9000:9000 ${MINIO_IMAGE}:${MINIO_TAG} server /data > /dev/null
+docker run --platform ${PLATFORM} --rm -i --link minio -e MC_HOST_minio=http://minioadmin:minioadmin@minio:9000 minio/mc:latest --quiet mb minio/backup
+docker run --platform ${PLATFORM} -i --name $TEST_NAME --link mongodb --link minio -e AWS_ACCESS_KEY_ID=minioadmin -e AWS_SECRET_ACCESS_KEY=minioadmin -e AWS_S3_ADDITIONAL_ARGS="--endpoint-url http://minio:9000" $TEST_CONTAINER save --host mongodb s3://backup
 cleanup mongodb minio $TEST_NAME
 
 echo "=> Test load command"
 TMPDIR="/tmp/data.$$"
 mkdir -p ${TMPDIR}
-docker run -d --name mongodb -p 27017:27017 ${MONGODB_IMAGE}:${MONGODB_TAG} > /dev/null
-docker run -d --name minio -p 9000:9000 ${MINIO_IMAGE}:${MINIO_TAG} server /data > /dev/null
-docker run --rm -i --link minio -e MC_HOST_minio=http://minioadmin:minioadmin@minio:9000 minio/mc:latest --quiet mb minio/backup
-docker run -i --name ${TEST_NAME}-save --link mongodb --link minio -e AWS_ACCESS_KEY_ID=minioadmin -e AWS_SECRET_ACCESS_KEY=minioadmin -e AWS_S3_ADDITIONAL_ARGS="--endpoint-url http://minio:9000" $TEST_CONTAINER save --host mongodb s3://backup
-docker run -i --name ${TEST_NAME}-load --link mongodb --link minio -e AWS_ACCESS_KEY_ID=minioadmin -e AWS_SECRET_ACCESS_KEY=minioadmin -e AWS_S3_ADDITIONAL_ARGS="--endpoint-url http://minio:9000" $TEST_CONTAINER load --host mongodb s3://backup config newdb
+docker run --platform ${PLATFORM} -d --name mongodb -p 27017:27017 ${MONGODB_IMAGE}:${MONGODB_TAG} > /dev/null
+docker run --platform ${PLATFORM} -d --name minio -p 9000:9000 ${MINIO_IMAGE}:${MINIO_TAG} server /data > /dev/null
+docker run --platform ${PLATFORM} --rm -i --link minio -e MC_HOST_minio=http://minioadmin:minioadmin@minio:9000 minio/mc:latest --quiet mb minio/backup
+docker run --platform ${PLATFORM} -i --name ${TEST_NAME}-save --link mongodb --link minio -e AWS_ACCESS_KEY_ID=minioadmin -e AWS_SECRET_ACCESS_KEY=minioadmin -e AWS_S3_ADDITIONAL_ARGS="--endpoint-url http://minio:9000" $TEST_CONTAINER save --host mongodb s3://backup
+docker run --platform ${PLATFORM} -i --name ${TEST_NAME}-load --link mongodb --link minio -e AWS_ACCESS_KEY_ID=minioadmin -e AWS_SECRET_ACCESS_KEY=minioadmin -e AWS_S3_ADDITIONAL_ARGS="--endpoint-url http://minio:9000" $TEST_CONTAINER load --host mongodb s3://backup config newdb
 cleanup mongodb minio ${TEST_NAME}-save ${TEST_NAME}-load
 rm -rf ${TMPDIR}
 echo "=> Done"