From 7135508d66c19ffaefaa51275608e3677e10bb7f Mon Sep 17 00:00:00 2001
From: Matthias Radestock <matthias.radestock@gmail.com>
Date: Tue, 21 Apr 2015 22:46:13 +0100
Subject: [PATCH] bump docker version requirement for `--with-dns` and explain
 why

Fixes #587.
---
 weave | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/weave b/weave
index 987ef3f7..72a1eda2 100755
--- a/weave
+++ b/weave
@@ -517,8 +517,12 @@ wait_for_status() {
 dns_args() {
     if [ \( "$DOCKER_VERSION_MAJOR" -lt 1 \) -o \
         \( "$DOCKER_VERSION_MAJOR" -eq 1 -a \
-        "$DOCKER_VERSION_MINOR" -lt 2 \) ] ; then
-        echo "ERROR: The '--with-dns' option requires Docker 1.2.0 or later; you are running $DOCKER_VERSION" >&2
+        "$DOCKER_VERSION_MINOR" -lt 3 \) ] ; then
+        # Versions prior to 1.2.0 cannot parse `--dns-search=.`, and
+        # versions prior to 1.3.0 fail to include the domain when
+        # setting the hostname, so lookups for non-fully-qualified
+        # names fail.
+        echo "ERROR: The '--with-dns' option requires Docker 1.3.0 or later; you are running $DOCKER_VERSION" >&2
         exit 1
     fi
     docker_bridge_ip