summaryrefslogtreecommitdiffstats
path: root/config/config_docker.json
diff options
context:
space:
mode:
author=Corey Hulen <corey@hulen.com>2015-07-23 10:15:53 -0800
committer=Corey Hulen <corey@hulen.com>2015-07-23 10:15:53 -0800
commit5b0d2dd8f9e7719215d6cfb878738221585a5e3f (patch)
tree865a61442818860a2f451b2a001ea6a8d7274e68 /config/config_docker.json
parent8d9449c068902f51a97e7a6605cd226bf4a26f2e (diff)
downloadchat-5b0d2dd8f9e7719215d6cfb878738221585a5e3f.tar.gz
chat-5b0d2dd8f9e7719215d6cfb878738221585a5e3f.tar.bz2
chat-5b0d2dd8f9e7719215d6cfb878738221585a5e3f.zip
Fixing merges for latest postgres
Diffstat (limited to 'config/config_docker.json')
-rw-r--r--config/config_docker.json4
1 files changed, 2 insertions, 2 deletions
diff --git a/config/config_docker.json b/config/config_docker.json
index a9ed98f1a..2d5a34539 100644
--- a/config/config_docker.json
+++ b/config/config_docker.json
@@ -35,8 +35,8 @@
},
"SqlSettings": {
"DriverName": "mysql",
- "DataSource": "mmuser:mostest@tcp(localhost:3306)/mattermost_test",
- "DataSourceReplicas": ["mmuser:mostest@tcp(localhost:3306)/mattermost_test"],
+ "DataSource": "mmuser:mostest@tcp(localhost:3306)/mattermost_test?charset=utf8mb4,utf8",
+ "DataSourceReplicas": ["mmuser:mostest@tcp(localhost:3306)/mattermost_test?charset=utf8mb4,utf8"],
"MaxIdleConns": 10,
"MaxOpenConns": 10,
"Trace": false,