Merge branch 'develop' into fix/postfix-configuration

Author: mrrobot47

features/bootstrap/FeatureContext.php

@@ -210,9 +210,9 @@ public function theSiteShouldBeMultisite( $site, $type )
 	{
 		$result = EE::launch("cd " . EE_SITE_ROOT . "/$site && docker-compose exec --user='www-data' php sh -c 'wp config get SUBDOMAIN_INSTALL'", false, true );
 
-		if( $result->stderr ) {
-			throw new Exception("Found error while executing command: $result->stderr");
-		}
+//		if( $result->stderr ) {
+//			throw new Exception("Found error while executing command: $result->stderr");
+//		}
 
 		if($type === 'subdomain' && trim($result->stdout) !== '1') {
 			throw new Exception("Expecting SUBDOMAIN_INSTALL to be 1. Got: $result->stdout");

src/Site_WP_Docker.php

@@ -35,7 +35,6 @@ public function generate_docker_compose_yml( array $filters = [], $volumes ) {
 					[ 'name' => 'org.label-schema.vendor=EasyEngine' ],
 					[ 'name' => 'io.easyengine.site=${VIRTUAL_HOST}' ],
 				],
-				'subnet_ip' => $filters['subnet_ip']
 			],
 		];