From bf58dd82c31bb3a71916eec743d0560e360c6e08 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 22 Sep 2016 22:38:18 +0200 Subject: [PATCH] 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 --- cmd/docker/daemon_unix.go | 1 + docs/deprecated.md | 7 +++++++ integration-cli/docker_cli_help_test.go | 10 ++-------- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/cmd/docker/daemon_unix.go b/cmd/docker/daemon_unix.go index 754bdeece3..f68d220c2f 100644 --- a/cmd/docker/daemon_unix.go +++ b/cmd/docker/daemon_unix.go @@ -24,6 +24,7 @@ func newDaemonCommand() *cobra.Command { RunE: func(cmd *cobra.Command, args []string) error { return runDaemon() }, + Deprecated: "and will be removed in Docker 1.16. Please run `dockerd` directly.", } cmd.SetHelpFunc(helpFunc) return cmd diff --git a/docs/deprecated.md b/docs/deprecated.md index c5c0b228ce..e7a301aa27 100644 --- a/docs/deprecated.md +++ b/docs/deprecated.md @@ -17,6 +17,13 @@ To learn more about Docker Engine's 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` **Deprecated In Release: [v0.6.7](https://github.com/docker/docker/releases/tag/v0.6.7)** diff --git a/integration-cli/docker_cli_help_test.go b/integration-cli/docker_cli_help_test.go index 5f916fedba..9603791239 100644 --- a/integration-cli/docker_cli_help_test.go +++ b/integration-cli/docker_cli_help_test.go @@ -86,14 +86,8 @@ func (s *DockerSuite) TestHelpTextVerify(c *check.C) { cmds := []string{} // Grab all chars starting at "Commands:" helpOut := strings.Split(out[i:], "\n") - // First line 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:] - } + // Skip first line, it is just "Commands:" + helpOut = helpOut[1:] // Create the list of commands we want to test cmdsToTest := []string{}