DEV: clean up docker detection
authorSam Saffron <sam.saffron@gmail.com>
Tue, 19 Mar 2019 07:52:23 +0000 (18:52 +1100)
committerSam Saffron <sam.saffron@gmail.com>
Tue, 19 Mar 2019 07:52:23 +0000 (18:52 +1100)
previously we would output stuff to console if docker.io was missing

launcher

index ec208264a052a22438b133f8ef714c9abcdb0949..de92c176507daa81d35585f5788eddfa7cebeb22 100755 (executable)
--- a/launcher
+++ b/launcher
@@ -81,7 +81,7 @@ config_file=containers/"$config".yml
 cidbootstrap=cids/"$config"_bootstrap.cid
 local_discourse=local_discourse
 image=discourse/base:2.0.20190217
-docker_path=`which docker.io || which docker`
+docker_path=`which docker.io 2> /dev/null || which docker`
 git_path=`which git`
 
 if [ "${SUPERVISED}" = "true" ]; then