commit 22ee2cf74c05055c58d47469012e1321276e1b1b
author Kengo Seki <sekikn@apache.org> Tue May 17 05:33:01 2016 +0900
committer Kengo Seki <sekikn@apache.org> Tue May 17 05:33:01 2016 +0900
tree 189424f42424911260655eb99974554a38e66f8e
parent 75d533c0971aa619370dfeaceb512102cd7b0fc7
parent 76e59c3dfa480f43a6f8357628217d09e5194a55

Merge branch 'master' into YETUS-379

precommit/core.d/docker.sh

diff --git a/precommit/core.d/docker.sh b/precommit/core.d/docker.sh
index 062c8c1..315dd29 100755
--- a/precommit/core.d/docker.sh
+++ b/precommit/core.d/docker.sh
@@ -144,7 +144,7 @@
 
   dockvers=$(docker_version Client)
   if [[ "${dockvers}" =~ ^0
-     || "${dockvers}" =~ ^1\.[0-5] ]]; then
+     || "${dockvers}" =~ ^1\.[0-5]$ || "${dockvers}" =~ ^1\.[0-5]\. ]]; then
     if [[ "${DOCKERFAIL}" =~ ^12
        || "${DOCKERFAIL}" =~ ^2 ]]; then
       add_vote_table 0 docker "Docker command '${DOCKERCMD}' is too old (${dockvers} < 1.6.0). Disabling docker."