Commit Graph

28 Commits

Author SHA1 Message Date
7cd5a4ceb5 review code about cmd/* and fix some easy typos :D
Signed-off-by: Aaron.L.Xu <likexu@harmonycloud.cn>
Upstream-commit: 0d8fd85842
Component: cli
2017-02-10 15:52:33 +08:00
1855724a2a print error if unsupported flags are used
Docker 1.13 and up allows a client to communicate
with older daemons. As a result, flags may be
present that are not supported by the older daemon.

The client already _hides_ flags that are not
supported yet, but this doesn't present users
from using those flags.

This change shows an error if a flag is used
that is not supported by the daemon (either
based on the API version, or because experimental
features are not enabled).

Note that for some options, a check is already
in place in the API client. For those
options, this is just a minor enhancement
to more clearly indicate which _flag_ is
not supported.

Before this change;

    DOCKER_API_VERSION=1.24 docker run -d --stop-timeout=30 busybox top
    mjfyt3qpvnq0iwmun3sjwth9i

    echo -e "FROM busybox\nRUN echo foo > bar" |  DOCKER_API_VERSION=1.24 docker build --squash -
    "squash" requires API version 1.25, but the Docker server is version 1.24

After this change;

    DOCKER_API_VERSION=1.24 docker run -d --stop-timeout=30 busybox top
    "--stop-timeout" requires API version 1.25, but the Docker daemon is version 1.24

    echo -e "FROM busybox\nRUN echo foo > bar" | DOCKER_API_VERSION=1.24 docker build --squash -
    "--squash" requires API version 1.25, but the Docker daemon is version 1.24

    echo -e "FROM busybox\nRUN echo foo > bar" | docker build --squash -
    "--squash" is only supported on a Docker daemon with experimental features enabled

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 0c71f36027
Component: cli
2017-02-03 16:59:20 -08:00
aeae0b960a Move package cliconfig to cli/config
I felt it made more sence 👼

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: d29175b73c
Component: cli
2016-12-25 20:31:52 +01:00
e670b03668 Move debug functions to cli/debug package
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 26c5b4b7b8
Component: cli
2016-12-12 09:33:58 +01:00
7365ba4700 Merge pull request #28611 from vieux/fix_golint
fix a few golint errors
Upstream-commit: 4d1209844f
Component: cli
2016-11-19 07:16:44 -05:00
08da0db0bf fix a few golint errors
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: 40acabdfe9
Component: cli
2016-11-18 18:32:02 -08:00
c0c99dbe13 error on cli when trying to use experimental feature with non experimental daemon
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: 1ab47a8be8
Component: cli
2016-11-17 14:52:01 -08:00
3164628a33 refactor help func in CLI
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: 05ddb16e59
Component: cli
2016-11-17 10:54:10 -08:00
cfe7cb61c6 Skip cli initialization for daemon command
Cli initialization pings back to remote API and
creates a deadlock if socket is already being
listened by systemd.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 28f8f92963
Component: cli
2016-11-16 13:19:45 -08:00
c6c57b1d27 Show experimental flags and subcommands if enabled
Signed-off-by: John Stephens <johnstep@docker.com>
Upstream-commit: 13d6a1bb67
Component: cli
2016-11-11 17:43:06 -08:00
cc37942a6e Use '.' directly
Signed-off-by: Wang Long <long.wanglong@huawei.com>
Upstream-commit: 076bfc0647
Component: cli
2016-11-11 10:22:32 +08:00
b322424e88 always add but hide experimental cmds and flags
Signed-off-by: Victor Vieux <vieux@docker.com>

update cobra and use Tags

Signed-off-by: Victor Vieux <vieux@docker.com>

allow client to talk to an older server

Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: e1beebbeef
Component: cli
2016-11-08 04:55:27 -08:00
35da390f93 Align arg with other cli
Signed-off-by: yupeng <yu.peng36@zte.com.cn>
Upstream-commit: 46418414a2
Component: cli
2016-11-05 13:47:02 +08:00
18b0c2adc0 update cobra and use Tags
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 2ee5bbcbfa
Component: cli
2016-11-04 12:04:14 -07:00
0fef0ef25c always add but hide experimental cmds and flags
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 73d63ec5a6
Component: cli
2016-11-03 17:31:12 -07:00
a70e23cbcd Align with other cli descriptions
Signed-off-by: yupeng <yu.peng36@zte.com.cn>
Upstream-commit: f1b1e55f7a
Component: cli
2016-11-01 13:41:49 +08:00
2ff5e5a0f8 Make experimental a runtime flag
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 773a7f6cb8
Component: cli
2016-10-24 15:20:01 -07:00
b77b8228bf Modify function name from SetDaemonLogLevel to SetLogLevel
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: a0e694d7c0
Component: cli
2016-10-11 19:35:12 +08:00
a5bf28b72a Move api/client -> cli/command
Using
  gomvpkg
     -from github.com/docker/docker/api/client
     -to github.com/docker/docker/cli/command
     -vcs_mv_cmd 'git mv {{.Src}} {{.Dst}}'

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: b2c77abc35
Component: cli
2016-09-08 15:46:29 -04:00
e110c778f4 Fix tests and windows service.
Support args to RunCommand
Fix docker help text test.
Fix for ipv6 tests.
Fix TLSverify option.
Fix TestDaemonDiscoveryBackendConfigReload
Use tempfile for another test.
Restore missing flag.
Fix tests for removal of shlex.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 9af25060cd
Component: cli
2016-08-25 13:09:36 -04:00
e062c54a99 Remove old cli framework.
Also consolidate the leftover packages under cli.
Remove pkg/mflag.
Make manpage generation work with new cobra layout.
Remove remaining mflag and fix tests after rebase with master.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 3b178887a7
Component: cli
2016-08-25 13:09:04 -04:00
7e9f26ef70 Update unit tests for new cobra root command.
Cleanup cobra integration
Update windows files for cobra and pflags
Cleanup SetupRootcmd, and remove unnecessary SetFlagErrorFunc.
Use cobra command traversal

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 58a14cd18c
Component: cli
2016-08-25 13:09:04 -04:00
c526dbb69a Convert docker root command to use pflag and cobra
Fix the daemon proxy for cobra commands.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 08784d7e0e
Component: cli
2016-08-25 13:09:03 -04:00
88b6751cda Convert dockerd to use cobra and pflag
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 23dd85befd
Component: cli
2016-08-25 13:09:03 -04:00
50bfe19924 Convert 'docker create' to use cobra and pflag
Return the correct status code on flag parsins errors.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: aee3578520
Component: cli
2016-06-04 13:57:30 +02:00
64201068c6 Migrate volume commands to cobra.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: ad83c422f2
Component: cli
2016-05-31 14:41:37 -07:00
9d807c4424 Consolidate the files in client/
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: ec6cc96fa1
Component: cli
2016-04-27 14:53:36 -04:00
977a19e21d Make dockerd debuggable
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: c6919a6e79
Component: cli
2016-04-26 09:35:22 -07:00