Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 39c54e5a7f into 062eecf14a

This commit is contained in:
Io. D 2024-10-20 23:33:53 +02:00 committed by GitHub
parent 062eecf14a 39c54e5a7f
commit 0865676873
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cli/command/container/create.go
View File

@ -39,6 +39,7 @@ type createOptions struct {
untrusted bool
pull string // always, missing, never
quiet bool
replace bool
}
// NewCreateCommand creates a new cobra.Command for `docker create`
@ -69,6 +70,7 @@ func NewCreateCommand(dockerCli command.Cli) *cobra.Command {
flags.StringVar(&options.name, "name", "", "Assign a name to the container")
flags.StringVar(&options.pull, "pull", PullImageMissing, `Pull image before creating ("`+PullImageAlways+`", "|`+PullImageMissing+`", "`+PullImageNever+`")`)
flags.BoolVarP(&options.quiet, "quiet", "q", false, "Suppress the pull output")
flags.BoolVarP(&options.replace, "replace", "", false, "If a container with the same name exists, replace it")
// Add an explicit help that doesn't have a `-h` to prevent the conflict
// with hostname
@ -267,6 +269,18 @@ func createContainer(ctx context.Context, dockerCli command.Cli, containerCfg *c
}
}
if options.replace {
if len(options.name) != 0 {
dockerCli.Client().ContainerRemove(ctx, options.name, container.RemoveOptions{
RemoveVolumes: false,
RemoveLinks: false,
Force: true,
})
} else {
return "", errors.Errorf("Error: cannot replace container without --name being set")
}
}
hostConfig.ConsoleSize[0], hostConfig.ConsoleSize[1] = dockerCli.Out().GetTtySize()
response, err := dockerCli.Client().ContainerCreate(ctx, config, hostConfig, networkingConfig, platform, options.name)