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>
| ... | ... |
@@ -24,6 +24,7 @@ func newDaemonCommand() *cobra.Command {
|
| 24 | 24 |
RunE: func(cmd *cobra.Command, args []string) error {
|
| 25 | 25 |
return runDaemon() |
| 26 | 26 |
}, |
| 27 |
+ Deprecated: "and will be removed in Docker 1.16. Please run `dockerd` directly.", |
|
| 27 | 28 |
} |
| 28 | 29 |
cmd.SetHelpFunc(helpFunc) |
| 29 | 30 |
return cmd |
| ... | ... |
@@ -17,6 +17,13 @@ To learn more about Docker Engine's deprecation policy, |
| 17 | 17 |
see [Feature Deprecation Policy](index.md#feature-deprecation-policy). |
| 18 | 18 |
|
| 19 | 19 |
|
| 20 |
+### `docker daemon` subcommand |
|
| 21 |
+**Deprecated In Release: [v1.13](https://github.com/docker/docker/releases/)** |
|
| 22 |
+ |
|
| 23 |
+**Target For Removal In Release: v1.16** |
|
| 24 |
+ |
|
| 25 |
+The daemon is moved to a separate binary (`dockerd`), and should be used instead. |
|
| 26 |
+ |
|
| 20 | 27 |
### Three argument form in `docker import` |
| 21 | 28 |
**Deprecated In Release: [v0.6.7](https://github.com/docker/docker/releases/tag/v0.6.7)** |
| 22 | 29 |
|
| ... | ... |
@@ -86,14 +86,8 @@ func (s *DockerSuite) TestHelpTextVerify(c *check.C) {
|
| 86 | 86 |
cmds := []string{}
|
| 87 | 87 |
// Grab all chars starting at "Commands:" |
| 88 | 88 |
helpOut := strings.Split(out[i:], "\n") |
| 89 |
- // First line is just "Commands:" |
|
| 90 |
- if isLocalDaemon {
|
|
| 91 |
- // Replace first line with "daemon" command since it's not part of the list of commands. |
|
| 92 |
- helpOut[0] = " daemon" |
|
| 93 |
- } else {
|
|
| 94 |
- // Skip first line |
|
| 95 |
- helpOut = helpOut[1:] |
|
| 96 |
- } |
|
| 89 |
+ // Skip first line, it is just "Commands:" |
|
| 90 |
+ helpOut = helpOut[1:] |
|
| 97 | 91 |
|
| 98 | 92 |
// Create the list of commands we want to test |
| 99 | 93 |
cmdsToTest := []string{}
|