Browse code
deprecate '-h' shorthand and remove '-help'
This deprecates the shorthand '-h', because we don't mention it as an option,
and it conflicts with the 'docker create -h/--hostname' option, so cannot be
used for all commands consistently.
This also removes the (single-dash) '-help' option. The single-dash variant was
marked "deprecated" in version 1.5.0 (basically, since it was added in
a2b529ead21e6ab9eafcb1b1d2437c725c43a06a), but still kept around to
prevent '-help' being treated as '-h -e -l -p', causing confusing
warnings.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 6add695084151a54a503c6e2597e05c17aa3d37f)
Sebastiaan van Stijn authored on 2016/05/25 23:44:58Showing 1 changed files
| ... | ... |
@@ -21,6 +21,17 @@ The following list of features are deprecated in Engine. |
| 21 | 21 |
|
| 22 | 22 |
The `docker import` command format 'file|URL|- [REPOSITORY [TAG]]' is deprecated since November 2013. It's no more supported. |
| 23 | 23 |
|
| 24 |
+### `-h` shorthand for `--help` |
|
| 25 |
+ |
|
| 26 |
+**Deprecated In Release: [v1.12.0](https://github.com/docker/docker/releases/tag/v1.12.0)** |
|
| 27 |
+ |
|
| 28 |
+**Target For Removal In Release: [v1.14.0](https://github.com/docker/docker/releases/tag/v1.12.0)** |
|
| 29 |
+ |
|
| 30 |
+The shorthand (`-h`) is less common than `--help` on Linux and cannot be used |
|
| 31 |
+on all subcommands (due to it conflicting with, e.g. `-h` / `--hostname` on |
|
| 32 |
+`docker create`). For this reason, the `-h` shorthand was not printed in the |
|
| 33 |
+"usage" output of subcommands, nor docummented, and is now marked "deprecated". |
|
| 34 |
+ |
|
| 24 | 35 |
### `-e` and `--email` flags on `docker login` |
| 25 | 36 |
**Deprecated In Release: [v1.11.0](https://github.com/docker/docker/releases/tag/v1.11.0)** |
| 26 | 37 |
|
| ... | ... |
@@ -149,6 +160,16 @@ The following double-dash options are deprecated and have no replacement: |
| 149 | 149 |
docker ps --before-id |
| 150 | 150 |
docker search --trusted |
| 151 | 151 |
|
| 152 |
+**Deprecated In Release: [v1.5.0](https://github.com/docker/docker/releases/tag/v1.5.0)** |
|
| 153 |
+ |
|
| 154 |
+**Removed In Release: [v1.12.0](https://github.com/docker/docker/releases/tag/v1.12.0)** |
|
| 155 |
+ |
|
| 156 |
+The single-dash (`-help`) was removed, in favor of the double-dash `--help` |
|
| 157 |
+ |
|
| 158 |
+ docker -help |
|
| 159 |
+ docker [COMMAND] -help |
|
| 160 |
+ |
|
| 161 |
+ |
|
| 152 | 162 |
### Interacting with V1 registries |
| 153 | 163 |
|
| 154 | 164 |
Version 1.9 adds a flag (`--disable-legacy-registry=false`) which prevents the docker daemon from `pull`, `push`, and `login` operations against v1 registries. Though disabled by default, this signals the intent to deprecate the v1 protocol. |