Remzona54/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2026-08-27 03:45:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

introduce --rmi and --volumes option on down

Browse source 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
This commit is contained in:
Nicolas De Loof 2021-02-17 15:22:26 +01:00
parent 65fc4ffb4e
commit f07a4a72b9
No known key found for this signature in database
GPG key ID: 9858809D6F8F6E7E
5 changed files with 65 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cli/cmd/compose/compose.go
View file

@ -107,7 +107,7 @@ func Command(contextType string) *cobra.Command {
command.AddCommand(
upCommand(&opts, contextType),
downCommand(&opts),
downCommand(&opts, contextType),
startCommand(&opts),
stopCommand(&opts),
psCommand(&opts),

18
cli/cmd/compose/down.go
View file

@ -18,6 +18,8 @@ package compose
import (
"context"
"fmt"
"github.com/docker/compose-cli/api/context/store"
"time"
"github.com/compose-spec/compose-go/types"
@ -35,9 +37,11 @@ type downOptions struct {
removeOrphans bool
timeChanged bool
timeout int
volumes bool
images string
}
func downCommand(p *projectOptions) *cobra.Command {
func downCommand(p *projectOptions, contextType string) *cobra.Command {
opts := downOptions{
projectOptions: p,
}
@ -46,6 +50,11 @@ func downCommand(p *projectOptions) *cobra.Command {
Short: "Stop and remove containers, networks",
RunE: func(cmd *cobra.Command, args []string) error {
opts.timeChanged = cmd.Flags().Changed("timeout")
if opts.images != "" {
if opts.images != "all" && opts.images != "local" {
return fmt.Errorf("invalid value for --rmi: %q", opts.images)
}
}
return runDown(cmd.Context(), opts)
},
}
@ -53,6 +62,11 @@ func downCommand(p *projectOptions) *cobra.Command {
flags.BoolVar(&opts.removeOrphans, "remove-orphans", false, "Remove containers for services not defined in the Compose file.")
flags.IntVarP(&opts.timeout, "timeout", "t", 10, "Specify a shutdown timeout in seconds")
switch contextType {
case store.LocalContextType, store.DefaultContextType, store.EcsLocalSimulationContextType:
flags.BoolVarP(&opts.volumes, "volumes", "v", false, " Remove named volumes declared in the `volumes` section of the Compose file and anonymous volumes attached to containers.")
flags.StringVar(&opts.images, "rmi", "", `Remove images used by services. "local" remove only images that don't have a custom tag ("local"|"all")`)
}
return downCmd
}
@ -83,6 +97,8 @@ func runDown(ctx context.Context, opts downOptions) error {
RemoveOrphans: opts.removeOrphans,
Project: project,
Timeout: timeout,
Images: opts.images,
Volumes: opts.volumes,
})
})
return err