Commit Graph

734 Commits

Author SHA1 Message Date
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
c9cfbb4d45 Merge pull request #31176 from adshmh/29662-stack-deploy-error-if-external-combined-with-other-volume-options
stack deploy exits with error if both 'external' and other options are specified for a volume
Upstream-commit: 4c4af071c7
Component: cli
2017-03-11 01:59:43 +01: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
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
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
e6440da44a Merge pull request #31443 from james-nesbitt/export-more-compose-methods
exported add. cli compose loader parsing methods
Upstream-commit: 889f0259c2
Component: cli
2017-03-08 15:12:42 +01:00
898ec88eed Merge pull request #31258 from dnephin/fix-override-default-stack-network
Support customizing the default network for a stack
Upstream-commit: f6f52d0823
Component: cli
2017-03-07 14:28:16 -05:00
ea19043c45 stack deploy exits with error if both 'external' and any other options are specified for volumes
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
Upstream-commit: 789652c41a
Component: cli
2017-03-07 14:21:45 -05:00
22f2b40227 exported cli compose loader parsing methods
Signed-off-by: James Nesbitt <james.nesbitt@wunderkraut.com>
Upstream-commit: b6f45eb18e
Component: cli
2017-03-07 17:36:35 +02: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
2afc0a3b17 Merge pull request #31543 from chawlanikhil24/master
Replaced "err" with  "nil" & added a comment
Upstream-commit: 3b8ecc089b
Component: cli
2017-03-06 15:11:14 +01:00
b6d1eb4781 Fixed the typo in the code
Signed-off-by: Nikhil Chawla <chawlanikhil24@gmail.com>
Upstream-commit: 80a8d7ca26
Component: cli
2017-03-06 17:31:04 +05:30
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
96ae1f807e 'docker daemon' deprecation message doesn't use the new versioning scheme
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 3f82787403
Component: cli
2017-03-03 17:26:49 +08:00
fd3a8adfe2 Merge pull request #30754 from yongtang/25696-stop-signal
Add `--stop-signal` for `service create` and `service update`
Upstream-commit: decce9cad1
Component: cli
2017-03-01 18:10:57 +01:00
c367119f5f Merge pull request #31124 from vdemeester/volume-unit-tests
Add unit tests to cli/command/volume package
Upstream-commit: 04d124ff1b
Component: cli
2017-03-01 14:13:47 +01:00
e1a103614c Add the mediaType to the error
Without this fix the error the client might see is:
	target is unknown
which wasn't helpful to me when I saw this today. With this fix I
now see:
	MediaType is unknown: 'text/html'
which helped me track down the issue to the registry I was talking to.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 05a3caff23
Component: cli
2017-02-28 11:36:32 -08:00
f87541dc93 Merge pull request #31290 from thaJeztah/print-d_type_warning
add d_type warning to docker info, and optimize output
Upstream-commit: 59f2b071df
Component: cli
2017-02-28 16:35:00 +01:00
3d78fa6385 Topology-aware scheduling
This adds support for placement preferences in Swarm services.

- Convert PlacementPreferences between GRPC API and HTTP API
- Add --placement-pref, --placement-pref-add and --placement-pref-rm to CLI
- Add support for placement preferences in service inspect --pretty
- Add integration test

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 21d5d1fa9d
Component: cli
2017-02-27 13:29:54 -08:00
7e228fcaaf Add unit tests to cli/command/volume package
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 407d65df9d
Component: cli
2017-02-27 18:39:35 +01:00
a6a721cf4e Merge pull request #30383 from TDAbboud/30096-add-host-docker-build
Add --add-host for docker build
Upstream-commit: 7665cb52dc
Component: cli
2017-02-27 12:42:18 +01:00
f341d1bde4 Merge pull request #31212 from fate-grand-order/fixed
use t.Fatal() to output the err message and fix typo
Upstream-commit: 76b6faa13d
Component: cli
2017-02-27 12:26:35 +09:00
f51c729cfc Fixed typo.
Signed-off-by: Genki Takiuchi <genki@s21g.com>
Upstream-commit: 5a53ae5170
Component: cli
2017-02-26 12:59:18 +09:00
123d371946 Support customizing the default network for a stack.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 5de7378cbe
Component: cli
2017-02-24 17:32:23 -05:00
b6d88b7b92 add d_type warning to docker info, and optimize output
The overlay(2) drivers were moved up in the list of storage drivers,
and are known to have problems if the backing filesystem does not
support d_type.

Commit 2e20e63da2a8a0ffbbb3f2146f87559e17f43046 added a warning,
which is logged in the daemon logs, however, many users do not
check those logs, and may overlook this warning.

This patch adds the same warning to the output of `docker info`
so that the warning is more easily found.

In addition, the output of warnings printed by `docker info` is
optimized, by;

- moving all warnings to the _end_ of the output, instead of
  mixing them with the regular output
- wrapping the storage-driver warnings, so that they are more
  easily readable

Example output with this patch applied
============================================

devicemapper using loopback devices:

    ...
    Insecure Registries:
     127.0.0.0/8
    Live Restore Enabled: false

    WARNING: devicemapper: usage of loopback devices is strongly discouraged for production use.
             Use `--storage-opt dm.thinpooldev` to specify a custom block storage device.
    WARNING: bridge-nf-call-iptables is disabled
    WARNING: bridge-nf-call-ip6tables is disabled

overlay2 on xfs without d_type support;

    ...
    Insecure Registries:
     127.0.0.0/8
    Live Restore Enabled: false

    WARNING: overlay2: the backing xfs filesystem is formatted without d_type support, which leads to incorrect behavior.
             Reformat the filesystem with ftype=1 to enable d_type support.
             Running without d_type support will not be supported in future releases.
    WARNING: bridge-nf-call-iptables is disabled

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: b09aa604c8
Component: cli
2017-02-23 13:36:57 +01:00
1195f9c5ee Delete dots to align with other commands description
Signed-off-by: yupengzte <yu.peng36@zte.com.cn>
Upstream-commit: 5b67f20a91
Component: cli
2017-02-23 16:46:08 +08:00
5145dfe136 use t.Fatal() to output the err message where the values used for formatting
text does not appear to contain a placeholder

Signed-off-by: Helen Xie <chenjg@harmonycloud.cn>
Upstream-commit: 98c222239e
Component: cli
2017-02-23 10:16:22 +08:00
e1a9ffba6b Add --stop-signal for service create and service update
This fix tries to address the issue raised in 25696 where
it was not possible to specify `--stop-signal` for `docker service create`
and `docker service update`, in order to use special signal to stop
the container.

This fix adds `--stop-signal` and update the `StopSignal` in `Config`
through `service create` and `service update`.

Related docs has been updated.

Integration test has been added.

This fix fixes 25696.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 9037f77d31
Component: cli
2017-02-21 15:19:45 -08:00
19b5092756 Merge pull request #31206 from xuzhenglun/master
fix wrong print format
Upstream-commit: adcf82c65a
Component: cli
2017-02-21 14:13:32 -08:00
b7afa18df2 fix wrong print format
Signed-off-by: Reficul <xuzhenglun@gmail.com>
Upstream-commit: a77cf51173
Component: cli
2017-02-21 10:26:06 +08:00
8daaeb5db9 Merge pull request #30814 from YuPengZTE/devSwarmCliExplain
fix the type
Upstream-commit: 0eacd8a363
Component: cli
2017-02-21 00:59:58 +01:00
4b398302d7 Add --add-host for docker build
Signed-off-by: Tony Abboud <tdabboud@hotmail.com>
Upstream-commit: e66e519e8d
Component: cli
2017-02-20 17:32:28 -05:00
d7f5ca1d45 add missing API changes
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: e858f5f7c4
Component: cli
2017-02-19 01:33:43 -08:00
d296e1a385 Merge pull request #28213 from yongtang/11062016-service-ps-format
Add `--format` to `docker service ps`
Upstream-commit: 91da14c343
Component: cli
2017-02-17 10:23:18 -08:00
0f240849ec Merge pull request #31114 from allencloud/split-compose-stack-deploy-from-deploydotgo
split compose deploy from deploy.go
Upstream-commit: cd904a5294
Component: cli
2017-02-17 08:48:51 -08:00
5dcfa95c07 Merge pull request #30848 from nishanttotla/suppress-digest-docker-ps
Suppressing image digest in docker ps
Upstream-commit: 798ed3eb6c
Component: cli
2017-02-17 10:27:49 +01:00
00c0b3590a split compose deploy from deploy.go
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 16b1631594
Component: cli
2017-02-17 17:13:31 +08:00