Merge pull request #431 from mrrobot47/update/compose-template

Changes for updated compose compatibility

Author: mrrobot47

src/site-type/HTML.php

@@ -330,6 +330,7 @@ public function dump_docker_compose_yml( $additional_filters = [] ) {
 
 		$filter                  = [];
 		$filter[]                = $this->site_data['site_type'];
+		$filter['site_url']      = $this->site_data['site_url'];
 		$filter['site_prefix']   = \EE_DOCKER::get_docker_style_prefix( $this->site_data['site_url'] );
 		$filter['is_ssl']        = $this->site_data['site_ssl'];
 		$filter['alias_domains'] = implode( ',', array_diff( explode( ',', $this->site_data['alias_domains'] ), [ $this->site_data['site_url'] ] ) );

src/site-type/Site_HTML_Docker.php

@@ -64,7 +64,7 @@ public function generate_docker_compose_yml( array $filters = [], $volumes ) {
 		$nginx['networks'] = [
 			'net' => [
 				[ 'name' => 'global-frontend-network' ],
-				[ 'name' => 'site-network' ],
+				[ 'name' => $filters['site_url'] ],
 			],
 		];
 
@@ -81,13 +81,14 @@ public function generate_docker_compose_yml( array $filters = [], $volumes ) {
 		$binding = [
 			'services' => $base,
 			'network'  => [
+				'name'            => $filters['site_url'],
 				'networks_labels' => [
 					'label' => [
 						[ 'name' => 'org.label-schema.vendor=EasyEngine' ],
 						[ 'name' => 'io.easyengine.site=${VIRTUAL_HOST}' ],
 					],
 				],
-			]
+			],
 		];
 
 		if ( ! IS_DARWIN ) {

templates/docker-compose.mustache

@@ -1,5 +1,3 @@
-version: '3.5'
-
 services:
 
 {{#services}}
@@ -63,22 +61,21 @@ services:
 volumes:
   {{#external_vols}}
   {{ext_vol_name}}:
-    external:
-      name: {{prefix}}_{{ext_vol_name}}
+    external: true
+    name: {{prefix}}_{{ext_vol_name}}
   {{/external_vols}}
 {{/created_volumes}}
 
 {{#network}}
 networks:
-  site-network:
-    name: ${VIRTUAL_HOST}
+  {{name}}:
     {{#networks_labels}}
     labels:
     {{#label}}
      - "{{name}}"
     {{/label}}
     {{/networks_labels}}
   global-frontend-network:
-    external:
-      name: ee-global-frontend-network
+    external: true
+    name: ee-global-frontend-network
 {{/network}}