From: Andrew Engelbrecht <andrew@fsf.org>
Date: Thu, 28 Feb 2019 15:32:23 +0000 (-0500)
Subject: Merge branch 'master' into fsf-master
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=fc6dfedde4de996041d55fb5878583d151a50736;p=discourse_docker.git

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

fc6dfedde4de996041d55fb5878583d151a50736
diff --cc launcher
index 1b78c50,19fbf45..ba5edb8
--- a/launcher
+++ b/launcher
@@@ -80,8 -80,7 +80,8 @@@ 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.20181031
 -image=discourse/base:2.0.20190217
++#image=discourse/base:2.0.20190217
 +image=discourse/base:build
  docker_path=`which docker.io || which docker`
  git_path=`which git`