From: Andrew Engelbrecht <andrew@fsf.org>
Date: Wed, 8 May 2019 18:54:25 +0000 (-0400)
Subject: Merge branch 'master' into fsf-master
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=cea069d404b160ad2c06445d3792d4c0cf4c63be;p=discourse_docker.git

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

cea069d404b160ad2c06445d3792d4c0cf4c63be
diff --cc image/discourse_test/Dockerfile
index 5eec468,3ad4f16..858de89
--- a/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 dc5ad68,b629bfc..f8bc9a7
--- 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.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`