projects
/
discourse_docker.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a104aca
)
skip prereqs also skips resource checks
author
Sam
<sam.saffron@gmail.com>
Mon, 28 Dec 2015 07:00:10 +0000
(18:00 +1100)
committer
Sam
<sam.saffron@gmail.com>
Mon, 28 Dec 2015 07:00:10 +0000
(18:00 +1100)
launcher
patch
|
blob
|
blame
|
history
diff --git
a/launcher
b/launcher
index c5cfe2acd25b9e049e9ffe5248ad658b4ef9c091..585864e04b8769326e84ed38681b55f14d25e802 100755
(executable)
--- 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