From 271787dd94cf504fdd9bc624101ccd5a010c3d25 Mon Sep 17 00:00:00 2001 From: yhua Date: Mon, 24 Oct 2016 16:51:42 +0800 Subject: [PATCH] update for fix #925 --- make/checkenv.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/make/checkenv.sh b/make/checkenv.sh index c29db5d7c..4c82c5522 100755 --- a/make/checkenv.sh +++ b/make/checkenv.sh @@ -69,7 +69,7 @@ function check_golang { fi # docker has been installed and check its version - if [[ $(go version) =~ (([0-9]+)\.([0-9]+)\.([0-9]*)) ]] + if [[ $(go version) =~ (([0-9]+)\.([0-9]+)([\.0-9]*)) ]] then golang_version=${BASH_REMATCH[1]} golang_version_part1=${BASH_REMATCH[2]} @@ -97,7 +97,7 @@ function check_docker { fi # docker has been installed and check its version - if [[ $(docker --version) =~ (([0-9]+)\.([0-9]+)\.([0-9]*)) ]] + if [[ $(docker --version) =~ (([0-9]+)\.([0-9]+)([\.0-9]*)) ]] then docker_version=${BASH_REMATCH[1]} docker_version_part1=${BASH_REMATCH[2]} @@ -125,7 +125,7 @@ function check_dockercompose { fi # docker-compose has been installed, check its version - if [[ $(docker-compose --version) =~ (([0-9]+)\.([0-9]+)\.([0-9]*)) ]] + if [[ $(docker-compose --version) =~ (([0-9]+)\.([0-9]+)([\.0-9]*)) ]] then docker_compose_version=${BASH_REMATCH[1]} docker_compose_version_part1=${BASH_REMATCH[2]}