Clarify choice of image

weaveworks · Sep 18, 2015 · 97a085b · 97a085b
1 parent d496edf
commit 97a085b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/test/225_dns_subdomain_test.sh b/test/225_dns_subdomain_test.sh
@@ -13,9 +13,9 @@ start_suite "Resolve names in custom domain with subdomains"
 
 weave_on $HOST1 launch --log-level=debug --dns-domain $DOMAIN.
 
-weave_on $HOST1 run --with-dns $C1/24 --name=c1 -h foo.$SUBDOMAIN1 -t ubuntu /bin/sh
-weave_on $HOST1 run --with-dns $C2/24 --name=c2 -h foo.$SUBDOMAIN2 -t ubuntu /bin/sh
-weave_on $HOST1 run --with-dns $C3/24 --name=c3 -h tre.$SUBDOMAIN1 --dns-search=$SUBDOMAIN2 -t ubuntu /bin/sh
+weave_on $HOST1 run --with-dns $C1/24 --name=c1 -h foo.$SUBDOMAIN1 -t $NONBROKENRESOLVER_IMAGE /bin/sh
+weave_on $HOST1 run --with-dns $C2/24 --name=c2 -h foo.$SUBDOMAIN2 -t $NONBROKENRESOLVER_IMAGE /bin/sh
+weave_on $HOST1 run --with-dns $C3/24 --name=c3 -h tre.$SUBDOMAIN1 --dns-search=$SUBDOMAIN2 -t $NONBROKENRESOLVER_IMAGE /bin/sh
 
 assert_dns_record   $HOST1 c1 foo.$SUBDOMAIN2 $C2
 assert_dns_a_record $HOST1 c3 foo             $C2 foo.$SUBDOMAIN2

diff --git a/test/config.sh b/test/config.sh
@@ -36,7 +36,9 @@ SSH=${SSH:-ssh -l vagrant -i "$SSH_DIR/insecure_private_key" -o "UserKnownHostsF
 
 SMALL_IMAGE="alpine"
 DNS_IMAGE="aanand/docker-dnsutils"
-TEST_IMAGES="$SMALL_IMAGE $DNS_IMAGE"
+# Alpine's name resolver ignores /etc/resolv.conf search path
+NONBROKENRESOLVER_IMAGE="ubuntu"
+TEST_IMAGES="$SMALL_IMAGE $DNS_IMAGE $NONBROKENRESOLVER_IMAGE"
 
 PING="ping -nq -W 1 -c 1"
 CHECK_ETHWE_UP="grep ^1$ /sys/class/net/ethwe/carrier"