Use newer docker-compose syntax for name of ddev_default network, fixes

#3069 (#3076)
ddev · Jun 30, 2021 · e430283 · e430283
1 parent 90e977d
commit e430283
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/pkg/ddevapp/templates.go b/pkg/ddevapp/templates.go
@@ -189,8 +189,8 @@ services:
 {{end}}
 networks:
   default:
-    external:
-      name: ddev_default
+    name: ddev_default
+    external: true
 volumes:
   {{if not .OmitDB }}
   mariadb-database:
@@ -467,8 +467,8 @@ services:
 
 networks:
   default:
-    external:
-      name: ddev_default
+    name: ddev_default
+    external: true
 volumes:
   ddev-global-cache:
     name: ddev-global-cache
@@ -510,6 +510,6 @@ services:
       timeout: 62s
 networks:
   default:
-    external:
-      name: ddev_default
+    name: ddev_default
+    external: true
 `
diff --git a/pkg/dockerutil/testdata/TestComposeWithStreams/test-compose-with-streams.yaml b/pkg/dockerutil/testdata/TestComposeWithStreams/test-compose-with-streams.yaml
@@ -1,7 +1,8 @@
 networks:
   default:
-    external:
-      name: ddev_default
+    name: ddev_default
+    external: true
+
 services:
   web:
     container_name: TestComposeWithStreams

diff --git a/pkg/dockerutil/testdata/docker-compose.yml b/pkg/dockerutil/testdata/docker-compose.yml
@@ -44,5 +44,6 @@ services:
       timeout: 120s
 networks:
   default:
-    external:
-      name: ddev_default
+    name: ddev_default
+    external: true
+