summaryrefslogtreecommitdiffstats
path: root/docker-entry.sh
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2015-06-16 19:46:56 -0400
committerChristopher Speller <crspeller@gmail.com>2015-06-16 19:46:56 -0400
commite022e87b663c330cfb2595aa875cf6dad76f4dd2 (patch)
tree96e1323e456ab6fbf7e0cca98b0fe7c60a87418a /docker-entry.sh
parent43a35119d453401d811c8e2ee289d60067dec442 (diff)
downloadchat-e022e87b663c330cfb2595aa875cf6dad76f4dd2.tar.gz
chat-e022e87b663c330cfb2595aa875cf6dad76f4dd2.tar.bz2
chat-e022e87b663c330cfb2595aa875cf6dad76f4dd2.zip
Using config.json instead of config_docker.json for docker. Note, this will break local dev builds.
Diffstat (limited to 'docker-entry.sh')
-rwxr-xr-xdocker-entry.sh5
1 files changed, 4 insertions, 1 deletions
diff --git a/docker-entry.sh b/docker-entry.sh
index 3a273e365..db6ccaa18 100755
--- a/docker-entry.sh
+++ b/docker-entry.sh
@@ -2,6 +2,9 @@
mkdir -p web/static/js
+echo "127.0.0.1 dockerhost" >> /etc/hosts
+/etc/init.d/networking restart
+
echo configuring mysql
# SQL!!!
@@ -111,7 +114,7 @@ echo starting react processor
cd /go/src/github.com/mattermost/platform/web/react && npm start &
echo starting go web server
-cd /go/src/github.com/mattermost/platform/; go run mattermost.go -config=config_docker.json &
+cd /go/src/github.com/mattermost/platform/; go run mattermost.go -config=config.json &
echo starting compass watch
cd /go/src/github.com/mattermost/platform/web/sass-files && compass watch