From: Andrew Engelbrecht <andrew@fsf.org>
Date: Mon, 8 Apr 2019 14:47:15 +0000 (-0400)
Subject: Merge branch 'master' into fsf-master
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=6717382dbf4bbd882a7f5ac2a02111f748c50882;p=discourse_docker.git

Merge branch 'master' into fsf-master

new docker image, according the launcher merge conflict
---

6717382dbf4bbd882a7f5ac2a02111f748c50882
diff --cc launcher
index 1f6d96b,4e61592..068b91e
--- 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.20190217
 -image="discourse/base:2.0.20190321-0122"
++#image="discourse/base:2.0.20190321-0122"
 +image=discourse/base:build
  docker_path=`which docker.io 2> /dev/null || which docker`
  git_path=`which git`