Commit Graph

616 Commits

Author SHA1 Message Date
1d07f176cb Return proper exit code on builder panic
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 82b04969b7
Component: cli
2017-03-21 19:09:23 -07:00
0cae42f93c Merge pull request #31705 from cyli/bump-go-connections
Use either a system pool or custom CA pool when connecting from client->daemon (+go-connections version bump)
Upstream-commit: 6bc233965e
Component: cli
2017-03-21 10:36:41 -07:00
ad7ff06c3f Merge pull request #31621 from dnephin/cleanup-container-run-command
Some cleanup of container run command
Upstream-commit: 250c3f0db2
Component: cli
2017-03-21 16:01:11 +01:00
70615a5680 Merge pull request #31552 from ripcurld0/add_format_secretls
Add format to secret ls
Upstream-commit: e1409013e5
Component: cli
2017-03-20 20:20:45 +01:00
5d9a5ce7dd fixed:go vetting warning unkeyed fields
Signed-off-by: Aaron.L.Xu <liker.xu@foxmail.com>
Upstream-commit: cc44dec589
Component: cli
2017-03-20 16:30:01 +08:00
bbac6dc261 Add format to secret ls
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
Upstream-commit: 1bac314da5
Component: cli
2017-03-19 09:22:30 +02:00
7332a7a5de Merge pull request #30781 from AkihiroSuda/fix-stack-env
compose: fix environment interpolation from the client
Upstream-commit: 6e24fc3f58
Component: cli
2017-03-17 15:56:50 +01:00
540d48f844 Merge pull request #31896 from aaronlehmann/move-secretrequestoption
api: Remove SecretRequestOption type
Upstream-commit: 2222824fd9
Component: cli
2017-03-16 21:31:15 +01:00
d88d78826a Merge pull request #31886 from daniel48/master
fix a typo
Upstream-commit: a3a3e2dba6
Component: cli
2017-03-16 21:30:22 +01:00
8698efadf8 api: Remove SecretRequestOption type
This type is only used by CLI code. It duplicates SecretReference in the
types/swarm package. Change the CLI code to use that type instead.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 395081fc6b
Component: cli
2017-03-16 11:20:31 -07:00
e28e72773d fix a typo
when i was using:
docker search --automated -s 3 nginx
told me:
Flag --automated has been deprecated, use --filter=automated=true instead
Flag --stars has been deprecated, use --filter=stars=3 instead
and when i use:
docker search --filter=automated=true --filter=stars=3 nginx
told me:
Error response from daemon: Invalid filter 'automated'
and i found out that the correct command should be:
docker search --filter=is-automated=true --filter=stars=3 nginx

Signed-off-by: Pure White <daniel48@126.com>
Upstream-commit: 7fe0d2d64d
Component: cli
2017-03-16 23:11:57 +08:00
c74c88f8f7 Add missing API version annotations to commands
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: d5d0d7795b
Component: cli
2017-03-16 13:40:12 +01:00
970755e1f9 Merge pull request #31775 from erxian/misleading-default-for-update-monitor-duration-flag
misleading default for --update-monitor duration
Upstream-commit: 96551fee53
Component: cli
2017-03-16 10:13:26 +01:00
e19ea1e497 Merge pull request #31866 from gdevillele/pr_service_create
improve semantics of utility function in cli/command/service
Upstream-commit: d4ed696179
Component: cli
2017-03-16 10:12:15 +01:00
f295088cb4 Merge pull request #31057 from krasi-georgiev/30779-fix-client-login-credentials-save-domain
fix incorect login client credential save when the registry is the default docker registry
Upstream-commit: 4031d93f61
Component: cli
2017-03-16 13:19:32 +09:00
559c313548 improve semantics of utility function in cli/command/service
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
Upstream-commit: 59c79325bc
Component: cli
2017-03-15 13:49:52 -07:00
2524c32d21 Revert "Planned 1.13 deprecation: email from login"
This reverts commit a66efbddb8eaa837cf42aae20b76c08274271dcf.

Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: bc771127d8
Component: cli
2017-03-15 10:43:18 -07:00
f462549c13 misleading default for --update-monitor duration
Signed-off-by: erxian <evelynhsu21@gmail.com>
Upstream-commit: 88a99ae70e
Component: cli
2017-03-15 14:20:02 +08:00
0ed0e112c4 Add --prune to stack deploy.
Add to command line reference.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: b1a98b55af
Component: cli
2017-03-14 16:09:28 -04:00
63bca6acc7 Fix environment resolving.
Load from env should only happen if the value is unset.
Extract a buildEnvironment function and revert some changes to tests.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 146d3eb304
Component: cli
2017-03-14 16:00:43 -04:00
85cd81c04a compose: fix environment interpolation from the client
For an environment variable defined in the yaml without value,
the value needs to be propagated from the client, as in Docker Compose.

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: b7ffa960bf
Component: cli
2017-03-14 15:59:40 -04:00
37cb7be49a Merge pull request #31809 from vieux/bump_api
bump API to 1.28
Upstream-commit: 5ce6afc459
Component: cli
2017-03-14 11:53:52 -07:00
29417b0159 bump API to 1.28
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: a972d43e48
Component: cli
2017-03-14 09:32:50 -07:00
2e62b306a8 Merge pull request #31500 from dperny/fix-service-logs-cli
Add tail and since to service logs
Upstream-commit: 7ce0cb0cf0
Component: cli
2017-03-14 14:19:29 +01:00
caa4b9a71c Merge pull request #31710 from sanimej/drillerrr
Add verbose flag to network inspect to show all services & tasks in swarm mode
Upstream-commit: 5ad1cebf78
Component: cli
2017-03-13 21:12:32 -07:00
acc4901d56 Enhance network inspect to show all tasks, local & non-local, in swarm mode
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
Upstream-commit: 6c7da0ca57
Component: cli
2017-03-13 17:52:08 -07:00
15bb8a00b0 Merge pull request #31672 from dperny/service-logs-formatting
Service logs formatting
Upstream-commit: 8b3bfc15c3
Component: cli
2017-03-13 19:08:55 -04:00
29b6bbfa5e Refactor container run cli command.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 4e388c22d3
Component: cli
2017-03-13 16:05:51 -04:00
fe5268e5c2 Merge pull request #31579 from ijc25/cpuacct
Correct CPU usage calculation in presence of offline CPUs and newer Linux
Upstream-commit: b786563826
Component: cli
2017-03-13 16:32:18 +00:00
69b02a7f96 Merge pull request #30788 from ripcurld0/hide_win_opts
Hide command options that are related to Windows
Upstream-commit: 278e4ccdc5
Component: cli
2017-03-13 16:15:29 +01:00
c0c565ca20 Merge pull request #30648 from allencloud/do-not-fail-fast-when-inspect
do not fail fast when executing inspect command
Upstream-commit: be1855fac4
Component: cli
2017-03-13 16:04:04 +01:00
0069d4e4ab Hide command options that are related to Windows
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
Upstream-commit: c7dd91faf5
Component: cli
2017-03-12 08:47:17 +02:00
f1c4ad2523 Merge pull request #30047 from duglin/distError
Add the mediaType to the error
Upstream-commit: 2881566c4a
Component: cli
2017-03-10 16:44:49 -08:00
aa331e2253 Add tail and since to service logs
This change adds the ability to do --tail and --since on docker service
logs. It wires up the API endpoints to each other and fixes some older
bugs. It adds integration tests for these new features.

Signed-off-by: Drew Erny <drew.erny@docker.com>
Upstream-commit: 7ce96255fd
Component: cli
2017-03-10 14:59:00 -08:00
17822109ce Merge pull request #31582 from dnephin/misc-flag-cleanup
Cleanup some memory flags used in the CLI
Upstream-commit: be3e4bbe77
Component: cli
2017-03-10 14:16:42 +01:00
0a02d14545 Correct CPU usage calculation in presence of offline CPUs and newer Linux
In https://github.com/torvalds/linux/commit/5ca3726 (released in v4.7-rc1) the
content of the `cpuacct.usage_percpu` file in sysfs was changed to include both
online and offline cpus. This broke the arithmetic in the stats helpers used by
`docker stats`, since it was using the length of the PerCPUUsage array as a
proxy for the number of online CPUs.

Add current number of online CPUs to types.StatsJSON and use it in the
calculation.

Keep a fallback to `len(v.CPUStats.CPUUsage.PercpuUsage)` so this code
continues to work when talking to an older daemon. An old client talking to a
new daemon will ignore the new field and behave as before.

Fixes #28941.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
Upstream-commit: 54a5077ca5
Component: cli
2017-03-10 10:24:33 +00:00
405e3ec554 do not fail fast when executing inspect command
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 49570cf783
Component: cli
2017-03-10 16:09:09 +08:00
6925ee6fc1 Use either the system root pool or an empty cert pool with custom CA roots,
and not a joint system+custom CA roots pool, when connecting from a docker
client to a remote daemon.

Signed-off-by: Ying Li <ying.li@docker.com>
Upstream-commit: 63bb7d89ad
Component: cli
2017-03-09 11:19:20 -08:00
c668006191 Fix description of docker run|create --stop-signal in help message
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 50a10e9bf4
Component: cli
2017-03-09 09:32:16 +01:00
ca1b295553 Fixed concerns, updated, and rebased PR.
Signed-off-by: Drew Erny <drew.erny@docker.com>
Upstream-commit: 3cda347b3d
Component: cli
2017-03-08 16:35:58 -08:00
ffb09e625f service logs: Improve formatting
- Align output. Previously, output would end up unaligned because of
longer task names (e.g. web.1 vs web.10)
- Truncate task IDs and add a --no-trunc option
- Added a --no-ids option to remove IDs altogether
- Got rid of the generic ID Resolver as we need more customization.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Upstream-commit: 1d379b9691
Component: cli
2017-03-08 14:08:04 -08:00
20f2e36290 Use opts.MemBytes for flags.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: e43a97cd38
Component: cli
2017-03-07 10:32:49 -05:00
92345732e9 Some things just need to be line wrapped.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 2238492c51
Component: cli
2017-03-06 16:01:57 -05:00
4009dade43 Implement server-side rollback, for daemon versions that support this
Server-side rollback can take advantage of the rollback-specific update
parameters, instead of being treated as a normal update that happens to
go back to a previous version of the spec.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 78c204ef79
Component: cli
2017-03-03 16:33:34 -08:00
b3a86717f1 Add support for rollback flags
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 8de01fb7a8
Component: cli
2017-03-03 16:33:34 -08:00
3fc9649978 Add support for the "rollback" failure action
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 5232868f46
Component: cli
2017-03-03 16:33:34 -08:00
1fcffa8b01 Fix error caused by overlapping merge of 30733
This fix fixes build error caused by overlapping merge of 30733 and 28213.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: e94294e902
Component: cli
2017-03-03 13:26:00 -08:00
05f8d09e46 Merge pull request #30733 from yongtang/02022017-formatter-header
Allow `--format` to use different delim in `table` format
Upstream-commit: 9fb77af2e6
Component: cli
2017-03-03 11:25:19 -08:00
f2d2a3e9a6 Merge pull request #30725 from aaronlehmann/topology
Topology-aware scheduling
Upstream-commit: ff11b0523d
Component: cli
2017-03-03 15:01:12 +01:00
00fbdfcce4 Merge pull request #31409 from yuexiao-wang/fix-version
'docker daemon' deprecation message doesn't use the new version
Upstream-commit: 1da02be7f5
Component: cli
2017-03-02 22:02:09 -05:00