mirror of https://github.com/docker/cli.git
Remove more TODOs
- Some of them don't make sense anymore - Some are deprecated and removed from the engine since a few versions already. Signed-off-by: Vincent Demeester <vincent@sbr.pm>
This commit is contained in:
parent
58173b3c69
commit
740d260cd2
|
@ -124,9 +124,6 @@ func runContainer(dockerCli command.Cli, opts *runOptions, copts *containerOptio
|
||||||
stdout, stderr := dockerCli.Out(), dockerCli.Err()
|
stdout, stderr := dockerCli.Out(), dockerCli.Err()
|
||||||
client := dockerCli.Client()
|
client := dockerCli.Client()
|
||||||
|
|
||||||
// TODO: pass this as an argument
|
|
||||||
cmdPath := "run"
|
|
||||||
|
|
||||||
warnOnOomKillDisable(*hostConfig, stderr)
|
warnOnOomKillDisable(*hostConfig, stderr)
|
||||||
warnOnLocalhostDNS(*hostConfig, stderr)
|
warnOnLocalhostDNS(*hostConfig, stderr)
|
||||||
|
|
||||||
|
@ -163,7 +160,7 @@ func runContainer(dockerCli command.Cli, opts *runOptions, copts *containerOptio
|
||||||
|
|
||||||
createResponse, err := createContainer(ctx, dockerCli, containerConfig, &opts.createOptions)
|
createResponse, err := createContainer(ctx, dockerCli, containerConfig, &opts.createOptions)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
reportError(stderr, cmdPath, err.Error(), true)
|
reportError(stderr, "run", err.Error(), true)
|
||||||
return runStartContainerErr(err)
|
return runStartContainerErr(err)
|
||||||
}
|
}
|
||||||
if opts.sigProxy {
|
if opts.sigProxy {
|
||||||
|
@ -209,7 +206,7 @@ func runContainer(dockerCli command.Cli, opts *runOptions, copts *containerOptio
|
||||||
<-errCh
|
<-errCh
|
||||||
}
|
}
|
||||||
|
|
||||||
reportError(stderr, cmdPath, err.Error(), false)
|
reportError(stderr, "run", err.Error(), false)
|
||||||
if copts.autoRemove {
|
if copts.autoRemove {
|
||||||
// wait container to be removed
|
// wait container to be removed
|
||||||
<-statusChan
|
<-statusChan
|
||||||
|
|
|
@ -124,7 +124,6 @@ func buildPullConfig(ctx context.Context, dockerCli command.Cli, opts pluginOpti
|
||||||
Disabled: opts.disable,
|
Disabled: opts.disable,
|
||||||
AcceptAllPermissions: opts.grantPerms,
|
AcceptAllPermissions: opts.grantPerms,
|
||||||
AcceptPermissionsFunc: acceptPrivileges(dockerCli, opts.remote),
|
AcceptPermissionsFunc: acceptPrivileges(dockerCli, opts.remote),
|
||||||
// TODO: Rename PrivilegeFunc, it has nothing to do with privileges
|
|
||||||
PrivilegeFunc: registryAuthFunc,
|
PrivilegeFunc: registryAuthFunc,
|
||||||
Args: opts.args,
|
Args: opts.args,
|
||||||
}
|
}
|
||||||
|
|
|
@ -40,7 +40,6 @@ func runRemove(dockerCli command.Cli, opts *rmOptions) error {
|
||||||
|
|
||||||
var errs cli.Errors
|
var errs cli.Errors
|
||||||
for _, name := range opts.plugins {
|
for _, name := range opts.plugins {
|
||||||
// TODO: pass names to api instead of making multiple api calls
|
|
||||||
if err := dockerCli.Client().PluginRemove(ctx, name, types.PluginRemoveOptions{Force: opts.force}); err != nil {
|
if err := dockerCli.Client().PluginRemove(ctx, name, types.PluginRemoveOptions{Force: opts.force}); err != nil {
|
||||||
errs = append(errs, err)
|
errs = append(errs, err)
|
||||||
continue
|
continue
|
||||||
|
|
|
@ -176,21 +176,6 @@ func prettyPrintInfo(dockerCli command.Cli, info types.Info) error {
|
||||||
for _, lbl := range info.Labels {
|
for _, lbl := range info.Labels {
|
||||||
fmt.Fprintln(dockerCli.Out(), " "+lbl)
|
fmt.Fprintln(dockerCli.Out(), " "+lbl)
|
||||||
}
|
}
|
||||||
// TODO: Engine labels with duplicate keys has been deprecated in 1.13 and will be error out
|
|
||||||
// after 3 release cycles (17.12). For now, a WARNING will be generated. The following will
|
|
||||||
// be removed eventually.
|
|
||||||
labelMap := map[string]string{}
|
|
||||||
for _, label := range info.Labels {
|
|
||||||
stringSlice := strings.SplitN(label, "=", 2)
|
|
||||||
if len(stringSlice) > 1 {
|
|
||||||
// If there is a conflict we will throw out a warning
|
|
||||||
if v, ok := labelMap[stringSlice[0]]; ok && v != stringSlice[1] {
|
|
||||||
fmt.Fprintln(dockerCli.Err(), "WARNING: labels with duplicate keys and conflicting values have been deprecated")
|
|
||||||
break
|
|
||||||
}
|
|
||||||
labelMap[stringSlice[0]] = stringSlice[1]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fmt.Fprintln(dockerCli.Out(), "Experimental:", info.ExperimentalBuild)
|
fmt.Fprintln(dockerCli.Out(), "Experimental:", info.ExperimentalBuild)
|
||||||
|
|
Loading…
Reference in New Issue