From 543109a5246645299c866b704b29fd39bb2a61d3 Mon Sep 17 00:00:00 2001 From: Alfonso Acosta Date: Mon, 26 Oct 2015 15:07:35 +0000 Subject: [PATCH] Make Docker version extraction more robust --- scope | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scope b/scope index cb125a2f0..390091a8b 100755 --- a/scope +++ b/scope @@ -35,7 +35,8 @@ shift 1 MIN_DOCKER_VERSION=1.5.0 check_docker_version() { - if ! DOCKER_VERSION=$(docker -v | grep -oE "[0-9]+\.[0-9]+\.[0-9]+") || [ -z "$DOCKER_VERSION" ] ; then + if ! DOCKER_VERSION=$(docker -v | sed -n 's%^Docker version \([0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}\).*$%\1%p') || + [ -z "$DOCKER_VERSION" ] ; then echo "ERROR: Unable to parse docker version" >&2 exit 1 fi