# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1448417605 28800
# Node ID 2d437a0f3355834a9485bbbeb30a52a052c98f19
# Parent  f97bb61b51e640b2510864ccf4a0504317915aff
docker: match more version of 'hg docker version' (issue4967)

My version of docker (1.8.3) have a different formating for 'docker version'
that broke the build script. We make the version matching more generic in to
work with both version.

diff -r f97bb61b51e6 -r 2d437a0f3355 contrib/dockerlib.sh
--- a/contrib/dockerlib.sh	Mon Nov 30 16:31:28 2015 -0800
+++ b/contrib/dockerlib.sh	Tue Nov 24 18:13:25 2015 -0800
@@ -14,8 +14,8 @@
   fi
 
   $DOCKER -h 2> /dev/null | grep -q Jansens && { echo "Error: $DOCKER is the Docking System Tray - install docker.io instead"; exit 1; }
-  $DOCKER version | grep -q "^Client version:" || { echo "Error: unexpected output from \"$DOCKER version\""; exit 1; }
-  $DOCKER version | grep -q "^Server version:" || { echo "Error: could not get docker server version - check it is running and your permissions"; exit 1; }
+  $DOCKER version | grep -Eq "^Client( version)?:" || { echo "Error: unexpected output from \"$DOCKER version\""; exit 1; }
+  $DOCKER version | grep -Eq "^Server( version)?:" || { echo "Error: could not get docker server version - check it is running and your permissions"; exit 1; }
 }
 
 # Construct a container and leave its name in $CONTAINER for future use.