Merge branch 'master' into fsf-master

diff --cc image/base/Dockerfile
Simple merge

diff --cc image/discourse_test/Dockerfile
index 5eec4680803a2b57f9be0228d508f7bd035ddd7f,3ad4f1659d682a32fe75e4162bb697d34e0478ce..858de89d06be7c84fea9d9c423a02068e914dffd
--- 1/image/discourse_test/Dockerfile
--- 2/image/discourse_test/Dockerfile
+++ b/image/discourse_test/Dockerfile
@@@ -1,8 -1,8 +1,9 @@@
  # NAME:     discourse/discourse_test
  # VERSION:  release
  ARG tag=build
 -FROM discourse/base:$tag
 +#FROM discourse/base:$tag
 +FROM discourse/base:build
+ ENV RAILS_ENV test
  
  MAINTAINER Sam Saffron "https://twitter.com/samsaffron"
  

diff --cc launcher
index dc5ad689e852fd34db22c29a8dfc18897a6f24a4,b629bfc1056ac1423ecce4ba07fe97fdd29b96ed..f8bc9a75985f0f1d1e779734859757dba878d573
--- 1/launcher
--- 2/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.20190321-0122"
 -image="discourse/base:2.0.20190429-1058"
++#image="discourse/base:2.0.20190429-1058"
 +image=discourse/base:build
  docker_path=`which docker.io 2> /dev/null || which docker`
  git_path=`which git`