mirror of
https://github.com/docker/compose.git
synced 2025-07-25 22:54:54 +02:00
fix support for compose run --label
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
This commit is contained in:
parent
99e75639d6
commit
e39ea13002
@ -141,7 +141,7 @@ func runCommand(p *projectOptions, backend api.Service) *cobra.Command {
|
|||||||
flags := cmd.Flags()
|
flags := cmd.Flags()
|
||||||
flags.BoolVarP(&opts.Detach, "detach", "d", false, "Run container in background and print container ID")
|
flags.BoolVarP(&opts.Detach, "detach", "d", false, "Run container in background and print container ID")
|
||||||
flags.StringArrayVarP(&opts.environment, "env", "e", []string{}, "Set environment variables")
|
flags.StringArrayVarP(&opts.environment, "env", "e", []string{}, "Set environment variables")
|
||||||
flags.StringArrayVarP(&opts.labels, "labels", "l", []string{}, "Add or override a label")
|
flags.StringArrayVarP(&opts.labels, "label", "l", []string{}, "Add or override a label")
|
||||||
flags.BoolVar(&opts.Remove, "rm", false, "Automatically remove the container when it exits")
|
flags.BoolVar(&opts.Remove, "rm", false, "Automatically remove the container when it exits")
|
||||||
flags.BoolVarP(&opts.noTty, "no-TTY", "T", notAtTTY(), "Disable pseudo-noTty allocation. By default docker compose run allocates a TTY")
|
flags.BoolVarP(&opts.noTty, "no-TTY", "T", notAtTTY(), "Disable pseudo-noTty allocation. By default docker compose run allocates a TTY")
|
||||||
flags.StringVar(&opts.name, "name", "", " Assign a name to the container")
|
flags.StringVar(&opts.name, "name", "", " Assign a name to the container")
|
||||||
@ -163,6 +163,8 @@ func normalizeRunFlags(f *pflag.FlagSet, name string) pflag.NormalizedName {
|
|||||||
switch name {
|
switch name {
|
||||||
case "volumes":
|
case "volumes":
|
||||||
name = "volume"
|
name = "volume"
|
||||||
|
case "labels":
|
||||||
|
name = "label"
|
||||||
}
|
}
|
||||||
return pflag.NormalizedName(name)
|
return pflag.NormalizedName(name)
|
||||||
}
|
}
|
||||||
|
@ -209,6 +209,6 @@ func applyRunOptions(project *types.Project, service *types.ServiceConfig, opts
|
|||||||
service.Environment.OverrideBy(projectEnv)
|
service.Environment.OverrideBy(projectEnv)
|
||||||
}
|
}
|
||||||
for k, v := range opts.Labels {
|
for k, v := range opts.Labels {
|
||||||
service.Labels.Add(k, v)
|
service.Labels = service.Labels.Add(k, v)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user