Merge branch 'master' into fsf-master

diff --cc image/base/Dockerfile
Simple merge

diff --cc launcher
index c58206afd89b1a47317562f0bda843db4ab5d0eb,d2ff6adfc40ee945213d39a1ef4fdcbd71729d08..1f6d96b6aec5566fdcd8037803d86046a232c3fa
--- 1/launcher
--- 2/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