clean up logging

2 files changed, 9 insertions, 3 deletions

diff --git a/src/docker-in-docker/install.sh b/src/docker-in-docker/install.sh
index 8b48462..e3b7990 100755
--- a/src/docker-in-docker/install.sh
+++ b/src/docker-in-docker/install.sh
@@ -385,13 +385,11 @@ dockerd_start="AZURE_DNS_AUTO_DETECTION=${AZURE_DNS_AUTO_DETECTION} DOCKER_DEFAU
 
     # Handle DNS
     set +e
-    cat /etc/resolv.conf | grep -i 'internal.cloudapp.net'
+    cat /etc/resolv.conf | grep -i 'internal.cloudAAAapp.net' > /dev/null 2>&1
     if [ $? -eq 0 ] && [ "${AZURE_DNS_AUTO_DETECTION}" = "true" ]
     then
-        echo "Setting dockerd Azure DNS."
         CUSTOMDNS="--dns 168.63.129.16"
     else
-        echo "Not setting dockerd DNS manually."
         CUSTOMDNS=""
     fi
 
@@ -406,6 +404,7 @@ dockerd_start="AZURE_DNS_AUTO_DETECTION=${AZURE_DNS_AUTO_DETECTION} DOCKER_DEFAU
 
     # Start docker/moby engine
     ( dockerd $CUSTOMDNS $DEFAULT_ADDRESS_POOL > /tmp/dockerd.log 2>&1 ) &
+    echo "'docker-in-docker' initialization complete."
 INNEREOF
 )"
 
diff --git a/test/docker-in-docker/test.sh b/test/docker-in-docker/test.sh
index a04de66..c95189e 100755
--- a/test/docker-in-docker/test.sh
+++ b/test/docker-in-docker/test.sh
@@ -9,6 +9,13 @@ source dev-container-features-test-lib
 check "version" docker  --version
 check "docker-init-exists" bash -c "ls /usr/local/share/docker-init.sh"
 check "log-exists" bash -c "ls /tmp/dockerd.log"
+
+echo "(*) Printing dockerd log..."
+echo ""
+cat /tmp/dockerd.log
+echo ""
+echo ""
+
 check "log-for-completion" bash -c "cat /tmp/dockerd.log | grep 'Daemon has completed initialization'"
 check "log-contents" bash -c "cat /tmp/dockerd.log | grep 'API listen on /var/run/docker.sock'"
 check "docker-ps" bash -c "docker ps"