Merge pull request #2445 from thaJeztah/19.03_backport_network_prune_improve_message

silvin-lubecki · web-flow · commit e238f67da8eb · 2020-04-21T17:23:18.000+02:00
[19.03 backport] improve "network prune" output to mention custom networks only
Upstream-commit: d25e657341e2425e746c29aa7b1950032396fb12
Component: cli
diff --git a/components/cli/cli/command/network/prune.go b/components/cli/cli/command/network/prune.go
@@ -43,7 +43,7 @@ func NewPruneCommand(dockerCli command.Cli) *cobra.Command {
 	return cmd
 }
 
-const warning = `WARNING! This will remove all networks not used by at least one container.
+const warning = `WARNING! This will remove all custom networks not used by at least one container.
 Are you sure you want to continue?`
 
 func runPrune(dockerCli command.Cli, options pruneOptions) (output string, err error) {
diff --git a/components/cli/docs/reference/commandline/network_prune.md b/components/cli/docs/reference/commandline/network_prune.md
@@ -27,7 +27,7 @@ by any containers.
 ```bash
 $ docker network prune
 
-WARNING! This will remove all networks not used by at least one container.
+WARNING! This will remove all custom networks not used by at least one container.
 Are you sure you want to continue? [y/N] y
 Deleted Networks:
 n1

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ func NewPruneCommand(dockerCli command.Cli) *cobra.Command {`
`43`	`43`	`return cmd`
`44`	`44`	`}`
`45`	`45`
`46`		-const warning = `WARNING! This will remove all networks not used by at least one container.
	`46`	+const warning = `WARNING! This will remove all custom networks not used by at least one container.
`47`	`47`	Are you sure you want to continue?`
`48`	`48`
`49`	`49`	`func runPrune(dockerCli command.Cli, options pruneOptions) (output string, err error) {`