Expose —remove-orphans in compose down command

gtardif · gtardif · commit 4b20d77a8689 · 2021-02-03T15:50:49.000+01:00
Signed-off-by: Guillaume Tardif &lt;guillaume.tardif@gmail.com&gt;
diff --git a/cli/cmd/compose/down.go b/cli/cmd/compose/down.go
@@ -31,6 +31,7 @@ import (
 
 type downOptions struct {
 	*projectOptions
+	removeOrphans bool
 }
 
 func downCommand(p *projectOptions) *cobra.Command {
@@ -44,6 +45,9 @@ func downCommand(p *projectOptions) *cobra.Command {
 			return runDown(cmd.Context(), opts)
 		},
 	}
+	flags := downCmd.Flags()
+	flags.BoolVar(&opts.removeOrphans, "remove-orphans", false, "Remove containers for services not defined in the Compose file.")
+
 	return downCmd
 }
 
@@ -66,7 +70,7 @@ func runDown(ctx context.Context, opts downOptions) error {
 		}
 
 		return name, c.ComposeService().Down(ctx, name, compose.DownOptions{
-			RemoveOrphans: false,
+			RemoveOrphans: opts.removeOrphans,
 			Project:       project,
 		})
 	})

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ import (`
`31`	`31`
`32`	`32`	`type downOptions struct {`
`33`	`33`	`*projectOptions`
	`34`	`+ removeOrphans bool`
`34`	`35`	`}`
`35`	`36`
`36`	`37`	`func downCommand(p projectOptions) cobra.Command {`
`@@ -44,6 +45,9 @@ func downCommand(p projectOptions) cobra.Command {`
`44`	`45`	`return runDown(cmd.Context(), opts)`
`45`	`46`	`},`
`46`	`47`	`}`
	`48`	`+ flags := downCmd.Flags()`
	`49`	`+ flags.BoolVar(&opts.removeOrphans, "remove-orphans", false, "Remove containers for services not defined in the Compose file.")`
	`50`	`+`
`47`	`51`	`return downCmd`
`48`	`52`	`}`
`49`	`53`
`@@ -66,7 +70,7 @@ func runDown(ctx context.Context, opts downOptions) error {`
`66`	`70`	`}`
`67`	`71`
`68`	`72`	`return name, c.ComposeService().Down(ctx, name, compose.DownOptions{`
`69`		`- RemoveOrphans: false,`
	`73`	`+ RemoveOrphans: opts.removeOrphans,`
`70`	`74`	`Project: project,`
`71`	`75`	`})`
`72`	`76`	`})`