From e430283d0fd4fe2459da62e5a12601dfefe98a86 Mon Sep 17 00:00:00 2001
From: Randy Fay <randy@randyfay.com>
Date: Tue, 29 Jun 2021 18:05:09 -0600
Subject: [PATCH] Use newer docker-compose syntax for name of ddev_default
 network, fixes #3069 (#3076)

---
 pkg/ddevapp/templates.go                             | 12 ++++++------
 .../test-compose-with-streams.yaml                   |  5 +++--
 pkg/dockerutil/testdata/docker-compose.yml           |  5 +++--
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/pkg/ddevapp/templates.go b/pkg/ddevapp/templates.go
index 5c88768f6d8..acc485dc834 100644
--- 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
index 8e5da6f6fbd..9a00043b8ce 100644
--- 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
index 44d91a0bdbf..d7271386487 100644
--- 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
+