projects / discourse_docker.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 35ccc9e e0bbec1)
Merge branch 'master' into fsf-master
authorAndrew Engelbrecht <andrew@fsf.org>
Wed, 17 Oct 2018 15:38:06 +0000 (11:38 -0400)
committerAndrew Engelbrecht <andrew@fsf.org>
Wed, 17 Oct 2018 15:38:06 +0000 (11:38 -0400)
1  2 
image/base/Dockerfile patch | diff1 | diff2 | blob | history
launcher patch | diff1 | diff2 | blob | history

diff --cc image/base/Dockerfile
Simple merge
diff --cc launcher
index 5daeb62f597a282d2b32846010cb2c2427b5c004,5604a85b16b4713221d517cc79a58258e6a14ad5..3a1091f6e795f14d7cff984f56e616211af5d69e
--- 1/launcher
--- 2/launcher
+++ b/launcher
@@@ -69,8 -69,7 +69,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.20180802
 -image=discourse/base:2.0.20181010
++#image=discourse/base:2.0.20181010
 +image=discourse/base:build
  docker_path=`which docker.io || which docker`
  git_path=`which git`