From: Matt Palmer <mpalmer@hezmatt.org>
Date: Tue, 31 Jan 2017 22:33:36 +0000 (+1100)
Subject: Improve check for approved storage driver [Closes #310]
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=90287f8e8aee601c29a41fd8e22927c67a2c4976;p=discourse_docker.git

Improve check for approved storage driver [Closes #310]

Previous test was both buggy and inefficient; we now avoid the need
to do a separate regex comparison.  I also improved the wording of
the error message somewhat to use Docker-Approved(TM) terminology.
---

diff --git a/launcher b/launcher
index 61b22ab..466640e 100755
--- a/launcher
+++ b/launcher
@@ -133,15 +133,15 @@ check_prereqs() {
     exit 1
   fi
 
-  # 2. running aufs or btrfs
-  test=`$docker_path info 2> /dev/null | grep 'Driver: '`
-  if [[ "$test" =~ [aufs|btrfs|zfs|overlay] ]] ; then : ; else
-    echo "Your Docker installation is not using a supported filesystem if we were to proceed you may have a broken install."
-    echo "aufs is the recommended filesystem you should be using (zfs/btrfs and overlay may work as well)"
-    echo "You can tell what filesystem you are using by running \"docker info\" and looking at the driver"
+  # 2. running an approved storage driver?
+  if ! $docker_path info 2> /dev/null | egrep -q '^Storage Driver: (aufs|btrfs|zfs|overlay)$'; then
+    echo "Your Docker installation is not using a supported storage driver.  If we were to proceed you may have a broken install."
+    echo "aufs is the recommended storage driver, although zfs/btrfs and overlay may work as well."
+    echo "Other storage drivers are known to be problematic."
+    echo "You can tell what filesystem you are using by running \"docker info\" and looking at the 'Storage Driver' line."
     echo
-    echo "If you wish to continue anyway using your existing unsupported filesystem, "
-    echo "read the source code of launcher and figure out how to bypass this."
+    echo "If you wish to continue anyway using your existing unsupported storage driver,"
+    echo "read the source code of launcher and figure out how to bypass this check."
     exit 1
   fi