From: Andrew Engelbrecht <andrew@fsf.org>
Date: Tue, 28 May 2019 18:08:30 +0000 (-0400)
Subject: Merge branch 'master' into fsf-master
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=100a3b11b84e994c72bd742db86a5ac0916599d4;p=discourse_docker.git

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

100a3b11b84e994c72bd742db86a5ac0916599d4
diff --cc launcher
index 11be646,8ef915c..070a8fc
--- a/launcher
+++ b/launcher
@@@ -81,8 -81,7 +81,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.20190429-1058"
 -image="discourse/base:2.0.20190505-2322"
++#image="discourse/base:2.0.20190505-2322"
 +image=discourse/base:build
  docker_path=`which docker.io 2> /dev/null || which docker`
  git_path=`which git`