Merge pull request #70 from JarvusInnovations/develop

Release: emergence v1.1.3
JarvusInnovations · Jun 10, 2019 · 76abe21 · 76abe21
2 parents 39bad71 + fa9f7f8
commit 76abe21
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/Dockerfile b/Dockerfile
@@ -86,6 +86,7 @@ RUN npm install -g /src
 # setup and expose emergence
 RUN mkdir -p /emergence
 EXPOSE 22 80 3306 9083
+ENV MYSQL_HOME=/emergence/services/etc
 VOLUME ["/emergence"]
 
 

diff --git a/kernel-lib/services/mysql.js b/kernel-lib/services/mysql.js
@@ -207,6 +207,13 @@ MysqlService.prototype.makeConfig = function () {
     var me = this,
         config = [];
 
+    config.push(
+        '[client]',
+        'socket                             = '+me.options.socketPath,
+        'user                               = '+me.options.managerUser,
+        'password                           = '+me.options.managerPassword
+    );
+
     config.push(
         '[mysqld]',
         'character-set-server               = utf8',

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "emergence",
   "preferGlobal": true,
-  "version": "1.1.2",
+  "version": "1.1.3",
   "license": "MIT",
   "dependencies": {
     "hostile": "^1.3.x",