Merge branch 'develop' into custom-docker-compose

Author: mrrobot47

src/Admin_Tools_Command.php

@@ -128,7 +128,7 @@ public function enable( $args, $assoc_args ) {
 		$docker_compose_data  = [
 			'ee_root_dir'   => EE_ROOT_DIR,
 			'db_path'       => DB,
-			'ee_admin_path' => $this->site_data->site_container_fs_path . '/ee-admin',
+			'ee_admin_path' => '/var/www/htdocs/ee-admin',
 			'redis_host'    => $this->site_data->cache_host,
 			'db_host'       => $this->site_data->db_host,
 		];

templates/index.mustache

@@ -71,7 +71,7 @@ $services = populate_site_info();
 unset( $services['id'] );
 unset( $services['site_url'] );
 
-$scan_dir = ( file_exists ( '/var/www/htdocs/current/ee-admin' ) ) ? '/var/www/htdocs/current/ee-admin' : '/var/www/htdocs/ee-admin';
+$scan_dir = '/var/www/htdocs/ee-admin';
 $scan     = scandir( $scan_dir );
 $scan     = array_diff( $scan, [ '.', '..', 'index.php' ] );