From: Andrew Engelbrecht <andrew@fsf.org>
Date: Thu, 11 Jul 2019 14:43:48 +0000 (-0400)
Subject: Merge branch 'master' into fsf-master
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=3d27f1f2531ea4d7388af67c4031c6fadd299cb5;p=discourse_docker.git

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

3d27f1f2531ea4d7388af67c4031c6fadd299cb5
diff --cc launcher
index 262e0fa,d9c53ae..764ba82
--- 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.20190505-2322"
 -image="discourse/base:2.0.20190625-0946"
++#image="discourse/base:2.0.20190625-0946"
 +image=discourse/base:build
  docker_path=`which docker.io 2> /dev/null || which docker`
  git_path=`which git`