From: Andrew Engelbrecht <andrew@fsf.org>
Date: Mon, 25 Mar 2019 15:16:08 +0000 (-0400)
Subject: Merge branch 'master' into fsf-master
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=b9f04fc174d9bb2b0da21dd1a8f46b3985cda99e;p=discourse_docker.git

Merge branch 'master' into fsf-master
---

b9f04fc174d9bb2b0da21dd1a8f46b3985cda99e
diff --cc launcher
index c58206a,d2ff6ad..1f6d96b
--- a/launcher
+++ b/launcher
@@@ -80,9 -81,8 +81,9 @@@ git_rec_version='1.8.0
  config_file=containers/"$config".yml
  cidbootstrap=cids/"$config"_bootstrap.cid
  local_discourse=local_discourse
 -image=discourse/base:2.0.20190217
 +#image=discourse/base:2.0.20190217
 +image=discourse/base:build
- 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