Deprecate "daemon" subcommand
The daemon is in a separate (dockerd) binary since docker 1.12, so should no longer be used. This marks the command as deprecated, and adds it to the deprecated features list. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
parent
dc8631ea53
commit
bf58dd82c3
|
@ -24,6 +24,7 @@ func newDaemonCommand() *cobra.Command {
|
||||||
RunE: func(cmd *cobra.Command, args []string) error {
|
RunE: func(cmd *cobra.Command, args []string) error {
|
||||||
return runDaemon()
|
return runDaemon()
|
||||||
},
|
},
|
||||||
|
Deprecated: "and will be removed in Docker 1.16. Please run `dockerd` directly.",
|
||||||
}
|
}
|
||||||
cmd.SetHelpFunc(helpFunc)
|
cmd.SetHelpFunc(helpFunc)
|
||||||
return cmd
|
return cmd
|
||||||
|
|
|
@ -17,6 +17,13 @@ To learn more about Docker Engine's deprecation policy,
|
||||||
see [Feature Deprecation Policy](index.md#feature-deprecation-policy).
|
see [Feature Deprecation Policy](index.md#feature-deprecation-policy).
|
||||||
|
|
||||||
|
|
||||||
|
### `docker daemon` subcommand
|
||||||
|
**Deprecated In Release: [v1.13](https://github.com/docker/docker/releases/)**
|
||||||
|
|
||||||
|
**Target For Removal In Release: v1.16**
|
||||||
|
|
||||||
|
The daemon is moved to a separate binary (`dockerd`), and should be used instead.
|
||||||
|
|
||||||
### Three argument form in `docker import`
|
### Three argument form in `docker import`
|
||||||
**Deprecated In Release: [v0.6.7](https://github.com/docker/docker/releases/tag/v0.6.7)**
|
**Deprecated In Release: [v0.6.7](https://github.com/docker/docker/releases/tag/v0.6.7)**
|
||||||
|
|
||||||
|
|
|
@ -86,14 +86,8 @@ func (s *DockerSuite) TestHelpTextVerify(c *check.C) {
|
||||||
cmds := []string{}
|
cmds := []string{}
|
||||||
// Grab all chars starting at "Commands:"
|
// Grab all chars starting at "Commands:"
|
||||||
helpOut := strings.Split(out[i:], "\n")
|
helpOut := strings.Split(out[i:], "\n")
|
||||||
// First line is just "Commands:"
|
// Skip first line, it is just "Commands:"
|
||||||
if isLocalDaemon {
|
|
||||||
// Replace first line with "daemon" command since it's not part of the list of commands.
|
|
||||||
helpOut[0] = " daemon"
|
|
||||||
} else {
|
|
||||||
// Skip first line
|
|
||||||
helpOut = helpOut[1:]
|
helpOut = helpOut[1:]
|
||||||
}
|
|
||||||
|
|
||||||
// Create the list of commands we want to test
|
// Create the list of commands we want to test
|
||||||
cmdsToTest := []string{}
|
cmdsToTest := []string{}
|
||||||
|
|
Loading…
Reference in New Issue