Merge branch 'sagarnasit-change-unix-path' into develop

mbtamuli · mbtamuli · commit 6e53579c5bfc · 2018-09-27T13:09:22.000+05:30
diff --git a/src/Admin_Tools_Command.php b/src/Admin_Tools_Command.php
@@ -30,7 +30,7 @@ class Admin_Tools_Command extends EE_Command {
 	public function __construct() {
 
 		$this->fs = new Filesystem();
-		define( 'ADMIN_TOOL_DIR', EE_CONF_ROOT . '/admin-tools' );
+		define( 'ADMIN_TOOL_DIR', EE_ROOT_DIR . '/admin-tools' );
 	}
 
 	/**
diff --git a/templates/docker-compose-admin.mustache b/templates/docker-compose-admin.mustache
@@ -5,9 +5,9 @@ services:
   php:
     volumes:
       - "/opt/easyengine/admin-tools:/var/www/htdocs/ee-admin:ro"
-      - "/opt/easyengine/ee.sqlite:/opt/easyengine/ee.sqlite:ro"
+      - "/opt/easyengine/db/ee.sqlite:/opt/easyengine/db/ee.sqlite:ro"
 
   nginx:
     volumes:
       - "/opt/easyengine/admin-tools:/var/www/htdocs/ee-admin:ro"
-      - "/opt/easyengine/ee.sqlite:/opt/easyengine/ee.sqlite:ro"  
+      - "/opt/easyengine/db/ee.sqlite:/opt/easyengine/db/ee.sqlite:ro"

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ class Admin_Tools_Command extends EE_Command {`
`30`	`30`	`public function __construct() {`
`31`	`31`
`32`	`32`	`$this->fs = new Filesystem();`
`33`		`- define( 'ADMIN_TOOL_DIR', EE_CONF_ROOT . '/admin-tools' );`
	`33`	`+ define( 'ADMIN_TOOL_DIR', EE_ROOT_DIR . '/admin-tools' );`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`/**`