2fc6cd4b71
compose: update the comment about MappingWithEquals
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
2017-03-17 06:21:55 +00:00
146d3eb304
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 >
2017-03-14 16:00:43 -04:00
b7ffa960bf
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 >
2017-03-14 15:59:40 -04:00
5ce6afc459
Merge pull request #31809 from vieux/bump_api
...
bump API to 1.28
2017-03-14 11:53:52 -07:00
d1fc5acc2e
Merge pull request #31795 from dnephin/compose-file-v3.2
...
Compose file v3.2
2017-03-14 14:10:24 -04:00
b8c49df008
Merge pull request #30597 from dnephin/add-expanded-mount-format-to-stack-deploy
...
Add expanded mount format to stack deploy
2017-03-14 17:53:28 +00:00
a972d43e48
bump API to 1.28
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
2017-03-14 09:32:50 -07:00
7ce0cb0cf0
Merge pull request #31500 from dperny/fix-service-logs-cli
...
Add tail and since to service logs
2017-03-14 14:19:29 +01:00
5ad1cebf78
Merge pull request #31710 from sanimej/drillerrr
...
Add verbose flag to network inspect to show all services & tasks in swarm mode
2017-03-13 21:12:32 -07:00
6c7da0ca57
Enhance network inspect to show all tasks, local & non-local, in swarm mode
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com >
2017-03-13 17:52:08 -07:00
8b3bfc15c3
Merge pull request #31672 from dperny/service-logs-formatting
...
Service logs formatting
2017-03-13 19:08:55 -04:00
2e9b15143a
Add compose file version 3.2
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2017-03-13 16:20:42 -04:00
33bfb1e5e5
Move endpoint_mode under deploy and add it to the schema.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2017-03-13 15:00:56 -04:00
cd1cde6e77
support both endpoint modes in stack
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
2017-03-13 15:00:49 -04:00
b786563826
Merge pull request #31579 from ijc25/cpuacct
...
Correct CPU usage calculation in presence of offline CPUs and newer Linux
2017-03-13 16:32:18 +00:00
278e4ccdc5
Merge pull request #30788 from ripcurld0/hide_win_opts
...
Hide command options that are related to Windows
2017-03-13 16:15:29 +01:00
be1855fac4
Merge pull request #30648 from allencloud/do-not-fail-fast-when-inspect
...
do not fail fast when executing inspect command
2017-03-13 16:04:04 +01:00
c7dd91faf5
Hide command options that are related to Windows
...
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com >
2017-03-12 08:47:17 +02:00
4c4af071c7
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
2017-03-11 01:59:43 +01:00
2881566c4a
Merge pull request #30047 from duglin/distError
...
Add the mediaType to the error
2017-03-10 16:44:49 -08:00
7ce96255fd
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 >
2017-03-10 14:59:00 -08:00
be3e4bbe77
Merge pull request #31582 from dnephin/misc-flag-cleanup
...
Cleanup some memory flags used in the CLI
2017-03-10 14:16:42 +01:00
54a5077ca5
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 >
2017-03-10 10:24:33 +00:00
49570cf783
do not fail fast when executing inspect command
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
2017-03-10 16:09:09 +08:00
50a10e9bf4
Fix description of docker run|create --stop-signal in help message
...
Signed-off-by: Harald Albers <github@albersweb.de >
2017-03-09 09:32:16 +01:00
3cda347b3d
Fixed concerns, updated, and rebased PR.
...
Signed-off-by: Drew Erny <drew.erny@docker.com >
2017-03-08 16:35:58 -08:00
1d379b9691
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 >
2017-03-08 14:08:04 -08:00
889f0259c2
Merge pull request #31443 from james-nesbitt/export-more-compose-methods
...
exported add. cli compose loader parsing methods
2017-03-08 15:12:42 +01:00
f6f52d0823
Merge pull request #31258 from dnephin/fix-override-default-stack-network
...
Support customizing the default network for a stack
2017-03-07 14:28:16 -05:00
789652c41a
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 >
2017-03-07 14:21:45 -05:00
b6f45eb18e
exported cli compose loader parsing methods
...
Signed-off-by: James Nesbitt <james.nesbitt@wunderkraut.com >
2017-03-07 17:36:35 +02:00
e43a97cd38
Use opts.MemBytes for flags.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2017-03-07 10:32:49 -05:00
2238492c51
Some things just need to be line wrapped.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2017-03-06 16:01:57 -05:00
63c3221dd3
Convert new compose volume type to swarm mount type
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2017-03-06 11:45:01 -05:00
29f39ea244
Support expanded mounts in Compose loader
...
Add a test for loading expanded mount format.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2017-03-06 11:45:01 -05:00
a442213b92
Parse a volume spec on the client, with support for windows drives
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2017-03-06 11:45:01 -05:00
d2d48f3f69
Add expanded mount syntax to Compose schema and types.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2017-03-06 11:45:01 -05:00
3b8ecc089b
Merge pull request #31543 from chawlanikhil24/master
...
Replaced "err" with "nil" & added a comment
2017-03-06 15:11:14 +01:00
80a8d7ca26
Fixed the typo in the code
...
Signed-off-by: Nikhil Chawla <chawlanikhil24@gmail.com >
2017-03-06 17:31:04 +05:30
78c204ef79
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 >
2017-03-03 16:33:34 -08:00
8de01fb7a8
Add support for rollback flags
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
2017-03-03 16:33:34 -08:00
5232868f46
Add support for the "rollback" failure action
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
2017-03-03 16:33:34 -08:00
e94294e902
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 >
2017-03-03 13:26:00 -08:00
9fb77af2e6
Merge pull request #30733 from yongtang/02022017-formatter-header
...
Allow `--format` to use different delim in `table` format
2017-03-03 11:25:19 -08:00
ff11b0523d
Merge pull request #30725 from aaronlehmann/topology
...
Topology-aware scheduling
2017-03-03 15:01:12 +01:00
1da02be7f5
Merge pull request #31409 from yuexiao-wang/fix-version
...
'docker daemon' deprecation message doesn't use the new version
2017-03-02 22:02:09 -05:00
3f82787403
'docker daemon' deprecation message doesn't use the new versioning scheme
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
2017-03-03 17:26:49 +08:00
decce9cad1
Merge pull request #30754 from yongtang/25696-stop-signal
...
Add `--stop-signal` for `service create` and `service update`
2017-03-01 18:10:57 +01:00
04d124ff1b
Merge pull request #31124 from vdemeester/volume-unit-tests
...
Add unit tests to cli/command/volume package
2017-03-01 14:13:47 +01:00
05a3caff23
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 >
2017-02-28 11:36:32 -08:00
