From: Sam <sam.saffron@gmail.com>
Date: Mon, 28 Dec 2015 07:00:10 +0000 (+1100)
Subject: skip prereqs also skips resource checks
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=d3c57e148e6e97b48713651c20ad39818b9b11b2;p=discourse_docker.git

skip prereqs also skips resource checks
---

diff --git a/launcher b/launcher
index c5cfe2a..585864e 100755
--- a/launcher
+++ b/launcher
@@ -63,7 +63,7 @@ usage () {
   echo "    cleanup:    Remove all containers that have stopped for > 24 hours"
   echo
   echo "Options:"
-  echo "    --skip-prereqs   Don't check prerequisites"
+  echo "    --skip-prereqs   Don't check prerequisites or resource requirements"
   echo "    --docker-args    Extra arguments to pass when running docker"
   exit 1
 }
@@ -466,7 +466,9 @@ run_start(){
 
 run_bootstrap(){
 
-  check_resources
+  if [ "$opt" != "--skip-prereqs" ] ; then
+    check_resources
+  fi
 
   host_run