From: Andrew Engelbrecht <andrew@fsf.org>
Date: Wed, 17 Oct 2018 15:38:06 +0000 (-0400)
Subject: Merge branch 'master' into fsf-master
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=1edc373add8648b1acb806a9fc85d43e88a5968a;p=discourse_docker.git

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

1edc373add8648b1acb806a9fc85d43e88a5968a
diff --cc launcher
index 5daeb62,5604a85..3a1091f
--- a/launcher
+++ b/launcher
@@@ -69,8 -69,7 +69,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.20180802
 -image=discourse/base:2.0.20181010
++#image=discourse/base:2.0.20181010
 +image=discourse/base:build
  docker_path=`which docker.io || which docker`
  git_path=`which git`