Merge branch 'kirtangajjar-fix-redis-site' into develop

Author: mbtamuli

features/site.feature

@@ -48,13 +48,23 @@ Feature: Site Command
         | header           |
         | HTTP/1.1 200 OK  |
 
+  Scenario: Create wp site successfully
+    When I run 'bin/ee site create wpcache.test --type=wp --cache'
+    Then After delay of 5 seconds
+    And The site 'wpcache.test' should have webroot
+    And The site 'wpcache.test' should have WordPress
+    And Request on 'wpcache.test' should contain following headers:
+      | header           |
+      | HTTP/1.1 200 OK  |
+
   Scenario: List the sites
     When I run 'bin/ee site list --format=text'
     Then STDOUT should return exactly
     """
     wp.test
     wpsubdir.test
     wpsubdom.test
+    wpcache.test
     """
 
   Scenario: Delete the sites

src/Site_WP_Docker.php

@@ -53,22 +53,28 @@ public function generate_docker_compose_yml( array $filters = [] ) {
 		// PHP configuration.
 		$php['service_name'] = [ 'name' => 'php' ];
 		$php['image']        = [ 'name' => 'easyengine/php:' . $img_versions['easyengine/php'] ];
-		$php['depends_on']   = [ 'name' => 'db' ];
-		$php['restart']      = $restart_default;
-		$php['labels']       = [
+
+		$php['depends_on']['dependency'][] = [ 'name' => 'db' ];
+
+		if ( in_array( 'redis', $filters, true ) ) {
+			$php['depends_on']['dependency'][] = [ 'name' => 'redis' ];
+		}
+
+		$php['restart']     = $restart_default;
+		$php['labels']      = [
 			'label' => [
 				'name' => 'io.easyengine.site=${VIRTUAL_HOST}',
 			],
 		];
-		$php['volumes']      = [
+		$php['volumes']     = [
 			[
 				'vol' => [
 					[ 'name' => './app/src:/var/www/htdocs' ],
 					[ 'name' => './config/php-fpm/php.ini:/usr/local/etc/php/php.ini' ],
 				],
 			],
 		];
-		$php['environment']  = [
+		$php['environment'] = [
 			'env' => [
 				[ 'name' => 'WORDPRESS_DB_HOST' ],
 				[ 'name' => 'WORDPRESS_DB_NAME' ],
@@ -79,13 +85,13 @@ public function generate_docker_compose_yml( array $filters = [] ) {
 				[ 'name' => 'VIRTUAL_HOST' ],
 			],
 		];
-		$php['networks']     = $network_default;
+		$php['networks']    = $network_default;
 
 		// nginx configuration.
-		$nginx['service_name'] = [ 'name' => 'nginx' ];
-		$nginx['image']        = [ 'name' => 'easyengine/nginx:' . $img_versions['easyengine/nginx'] ];
-		$nginx['depends_on']   = [ 'name' => 'php' ];
-		$nginx['restart']      = $restart_default;
+		$nginx['service_name']               = [ 'name' => 'nginx' ];
+		$nginx['image']                      = [ 'name' => 'easyengine/nginx:' . $img_versions['easyengine/nginx'] ];
+		$nginx['depends_on']['dependency'][] = [ 'name' => 'php' ];
+		$nginx['restart']                    = $restart_default;
 
 		$v_host = in_array( 'subdom', $filters, true ) ? 'VIRTUAL_HOST=${VIRTUAL_HOST},*.${VIRTUAL_HOST}' : 'VIRTUAL_HOST';
 

templates/config/nginx/default.conf.mustache

@@ -22,7 +22,7 @@ server {
 		set $skip 1;
 	}
 	# Don't cache URL containing the following segments
-	if ($request_uri ~* "(/wp-admin/|/xmlrpc.php|wp-.*.php|index.php|/feed/|sitemap(_index)?.xml|[a-z0-9_-]+-sitemap([0-9]+)?.xml)") {
+	if ($request_uri ~* "(/ee-admin/|/wp-admin/|/xmlrpc.php|wp-.*.php|index.php|/feed/|sitemap(_index)?.xml|[a-z0-9_-]+-sitemap([0-9]+)?.xml)") {
 		set $skip 1;
 	}
 	# Don't use the cache for logged in users or recent commenter or customer with items in cart
@@ -159,7 +159,7 @@ server {
 		access_log off;
 		log_not_found off;
 	}
-	
+
 	# Deny backup extensions & log files
 	location ~* ^.+\.(bak|log|old|orig|original|php#|php~|php_bak|save|swo|swp|sql)$ {
 		deny all;

templates/docker-compose.mustache

@@ -14,7 +14,9 @@ services:
     {{/hostname}}
     {{#depends_on}}
     depends_on:
+    {{#dependency}}
       - {{name}}
+	{{/dependency}}
     {{/depends_on}}
     {{#restart}}
     restart: {{name}}