Merge pull request #27 from mrrobot47/add/support-for-mac

Updates for admin-tools

Author: rahulsprajapati

src/Admin_Tools_Command.php

@@ -127,7 +127,13 @@ public function enable( $args, $assoc_args ) {
 		$this->install();
 		chdir( $this->site_data->site_fs_path );
 
-		$this->move_config_file( 'docker-compose-admin.mustache', $this->site_data->site_fs_path . '/docker-compose-admin.yml' );
+		$docker_compose_data  = [
+			'ee_root_dir'   => EE_ROOT_DIR,
+			'db_path'       => DB,
+			'ee_admin_path' => '/var/www/htdocs/ee-admin',
+		];
+		$docker_compose_admin = EE\Utils\mustache_render( ADMIN_TEMPLATE_ROOT . '/docker-compose-admin.mustache', $docker_compose_data );
+		$this->fs->dumpFile( $this->site_data->site_fs_path . '/docker-compose-admin.yml', $docker_compose_admin );
 
 		if ( EE::exec( 'docker-compose -f docker-compose.yml -f docker-compose-admin.yml up -d nginx' ) ) {
 			EE::success( sprintf( 'admin-tools enabled for %s site.', $this->site_data->site_url ) );

templates/docker-compose-admin.mustache

@@ -4,10 +4,10 @@ services:
 
   php:
     volumes:
-      - "/opt/easyengine/admin-tools:/var/www/htdocs/ee-admin:ro"
-      - "/opt/easyengine/db/ee.sqlite:/opt/easyengine/db/ee.sqlite:ro"
+      - "{{ee_root_dir}}/admin-tools:{{ee_admin_path}}:ro"
+      - "{{db_path}}:{{db_path}}:ro"
 
   nginx:
     volumes:
-      - "/opt/easyengine/admin-tools:/var/www/htdocs/ee-admin:ro"
-      - "/opt/easyengine/db/ee.sqlite:/opt/easyengine/db/ee.sqlite:ro"
+      - "{{ee_root_dir}}/admin-tools:{{ee_admin_path}}:ro"
+      - "{{db_path}}:{{db_path}}:ro"

templates/index.mustache

@@ -73,9 +73,13 @@ unset( $services['site_url'] );
 
 
 $scan  = scandir( '{{ee_admin_path}}' );
-$tools = array_slice( $scan, 2 );
+$scan  = array_diff( $scan, [ '.', '..', 'index.php' ] );
 
-$tools = array_diff( $tools, [ 'index.php' ] );
+$tools = array_merge( $scan, [ 'nginx_status', 'ping', 'status' ] );
+if ( $services['mailhog_enabled'] ) {
+	$tools[] = 'mailhog';
+}
+sort( $tools );
 
 if ( ! $services['cache_nginx_fullpage'] ) {
 	$tools = array_diff( $tools, [ 'pra' ] );