Merge remote-tracking branch 'origin/develop' into fix/postfix-configuration

Author: kirtangajjar

src/Site_WP_Docker.php

@@ -35,6 +35,7 @@ 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']
 			],
 		];
 

src/WordPress.php

@@ -258,11 +258,11 @@ public function __construct() {
 	 */
 	public function create( $args, $assoc_args ) {
 
-		$this->check_site_count();
 		\EE\Utils\delem_log( 'site create start' );
 		$this->logger->debug( 'args:', $args );
 		$this->logger->debug( 'assoc_args:', empty( $assoc_args ) ? array( 'NULL' ) : $assoc_args );
-		$this->site_data['site_url'] = strtolower( \EE\Utils\remove_trailing_slash( $args[0] ) );
+		$this->site_data['site_url']  = strtolower( \EE\Utils\remove_trailing_slash( $args[0] ) );
+		$this->site_data['subnet_ip'] = \EE\Site\Utils\get_subnet_ip();
 
 		$mu                              = \EE\Utils\get_flag_value( $assoc_args, 'mu' );
 		$this->site_data['app_sub_type'] = $mu ?? 'wp';
@@ -436,6 +436,7 @@ public function create( $args, $assoc_args ) {
 		\EE::log( 'Configuring project.' );
 
 		$this->create_site( $assoc_args );
+
 		\EE\Utils\delem_log( 'site create end' );
 	}
 
@@ -828,6 +829,7 @@ public function dump_docker_compose_yml( $additional_filters = [] ) {
 		$filter['site_prefix']   = \EE_DOCKER::get_docker_style_prefix( $this->site_data['site_url'] );
 		$filter['php_version']   = ( string ) $this->site_data['php_version'];
 		$filter['alias_domains'] = implode( ',', array_diff( explode( ',', $this->site_data['alias_domains'] ), [ $this->site_data['site_url'] ] ) );
+		$filter['subnet_ip']     = $this->site_data['subnet_ip'];
 		$site_docker             = new Site_WP_Docker();
 
 		foreach ( $additional_filters as $key => $addon_filter ) {
@@ -1368,10 +1370,10 @@ private function setup_vip( $assoc_args ) {
 	 * Function to save the site configuration entry into database.
 	 */
 	private function create_site_db_entry() {
-		$ssl = null;
 
 		$data = [
 			'site_url'               => $this->site_data['site_url'],
+			'subnet_ip'              => $this->site_data['subnet_ip'],
 			'site_type'              => $this->site_data['site_type'],
 			'app_admin_url'          => $this->site_data['app_admin_url'],
 			'app_admin_email'        => $this->site_data['app_admin_email'],

templates/docker-compose.mustache

@@ -83,6 +83,9 @@ networks:
     {{#label}}
      - "{{name}}"
     {{/label}}
+    ipam:
+      config:
+      - subnet: '{{subnet_ip}}'
     {{/networks_labels}}
   global-frontend-network:
     external: