Merge branch 'update/webroot' of https://github.com/mrrobot47/site-command into mrrobot47-update/webroot

Author: mbtamuli

ci/prepare.sh

@@ -10,6 +10,7 @@ rm ee
 cd ..
 git clone https://github.com/EasyEngine/easyengine.git easyengine --depth=1
 cd easyengine
+echo 'travis_test' > VERSION
 
 # Copy tests to EE repo
 rm -r features

src/Site_Command.php

@@ -1071,7 +1071,7 @@ private function wp_download_and_config( $assoc_args ) {
 
 		EE::log( 'Downloading and configuring WordPress.' );
 
-		$chown_command = "docker-compose exec php chown -R www-data: /var/www/";
+		$chown_command = "docker-compose exec --user=root php chown -R www-data: /var/www/";
 		\EE\Utils\default_launch( $chown_command );
 
 		$core_download_command = "docker-compose exec --user='www-data' php wp core download --locale='" . $this->locale . "' " . $core_download_arguments;

src/Site_Docker.php

@@ -47,7 +47,7 @@ public function generate_docker_compose_yml( array $filters = [] ) {
 		$php['volumes']      = array(
 			array(
 				'vol' => array(
-					array( 'name' => './app/src:/var/www/html' ),
+					array( 'name' => './app/src:/var/www/htdocs' ),
 					array( 'name' => './config/php-fpm/php.ini:/usr/local/etc/php/php.ini' ),
 				),
 			),
@@ -82,7 +82,7 @@ public function generate_docker_compose_yml( array $filters = [] ) {
 		);
 		$nginx['volumes']     = array(
 			'vol' => array(
-				array( 'name' => './app/src:/var/www/html' ),
+				array( 'name' => './app/src:/var/www/htdocs' ),
 				array( 'name' => './config/nginx/default.conf:/etc/nginx/conf.d/default.conf' ),
 				array( 'name' => './logs/nginx:/var/log/nginx' ),
 				array( 'name' => './config/nginx/common:/usr/local/openresty/nginx/conf/common' ),

templates/config/nginx/default.conf.mustache

@@ -5,7 +5,7 @@ server {
 	access_log   /var/log/nginx/access.log;
 	error_log    /var/log/nginx/error.log;
 
-	root /var/www/html;
+	root /var/www/htdocs;
 
 	server_name {{server_name}};