Merge branch 'master' into devel

brainlabs · Jun 6, 2018 · efe91bc · efe91bc
2 parents 65fbf51 + c81cf41
commit efe91bc
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/.github/issue_template.md b/.github/issue_template.md
@@ -7,7 +7,7 @@ Describe your issue here.
 
 ### Your environment
 - [ ] api.tinode.co
-- [ ] Your wn setup:
+- [ ] Your own setup:
   * platform (Windows, Mac, Linux etc)
   * version of tinode server
   * database backend

diff --git a/docker/tinode/Dockerfile b/docker/tinode/Dockerfile
@@ -27,6 +27,9 @@ ENV TARGET_DB=$TARGET_DB
 # An option to reset database.
 ENV RESET_DB=false
 
+# The MYSQL DSN connection.
+ENV MYSQL_DSN='root@tcp(mysql)/tinode'
+
 # Disable chatbot plugin by default.
 ENV PLUGIN_PYTHON_CHAT_BOT_ENABLED=false
 

diff --git a/docker/tinode/config.template b/docker/tinode/config.template
@@ -32,7 +32,7 @@
 		"adapters": {
 			"mysql": {
 				"database": "tinode",
-				"dsn": "root@tcp(mysql)/tinode?parseTime=true"
+				"dsn": "$MYSQL_DSN?parseTime=true"
 			},
 			"rethinkdb": {
 				"database": "tinode",