Issue ricardoamaro#34 checking for different docker version formats

legovaer · Jun 7, 2016 · eeded62 · eeded62
1 parent e67e57f
commit eeded62
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/scripts/build_all.sh b/scripts/build_all.sh
@@ -167,7 +167,12 @@ if [ ! -f /usr/bin/docker ];
   else
   echo
   # Check Docker Version
-  DOCKER_VERSION=$(docker version | grep "Server version" | awk '{print $3}')
+  if [ -z $(docker version | grep "Server version" | awk '{print $3}') ];
+    then
+    DOCKER_VERSION=$(docker version --format '{{.Server.Version}}')
+    else
+    DOCKER_VERSION=$(docker version | grep "Server version" | awk '{print $3}')
+  fi
   if [ -z "${DOCKER_VERSION}" ];
     then
     echo