Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use newer syntax for default network, fixes #3069 #3076

Merged
merged 1 commit into from Jun 30, 2021
Merged

Use newer syntax for default network, fixes #3069 #3076

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 6 additions & 6 deletions pkg/ddevapp/templates.go
View file
Open in desktop
Expand Up @@ -189,8 +189,8 @@ services:
{{end}}
networks:
default:
external:
name: ddev_default
name: ddev_default
external: true
volumes:
{{if not .OmitDB }}
mariadb-database:
Expand Down Expand Up @@ -467,8 +467,8 @@ services:

networks:
default:
external:
name: ddev_default
name: ddev_default
external: true
volumes:
ddev-global-cache:
name: ddev-global-cache
Expand Down Expand Up @@ -510,6 +510,6 @@ services:
timeout: 62s
networks:
default:
external:
name: ddev_default
name: ddev_default
external: true
`
5 changes: 3 additions & 2 deletions pkg/dockerutil/testdata/TestComposeWithStreams/test-compose-with-streams.yaml
View file
Open in desktop
@@ -1,7 +1,8 @@
networks:
default:
external:
name: ddev_default
name: ddev_default
external: true

services:
web:
container_name: TestComposeWithStreams
Expand Down
5 changes: 3 additions & 2 deletions pkg/dockerutil/testdata/docker-compose.yml
View file
Open in desktop
Expand Up @@ -44,5 +44,6 @@ services:
timeout: 120s
networks:
default:
external:
name: ddev_default
name: ddev_default
external: true