Sebastiaan van Stijn
ad43a90ae5
Merge pull request #31894 from dnephin/fix-schema-id
...
Fix compose schema id for v3.2
Upstream-commit: 1aca09b8cc
2017-03-16 21:19:59 +01:00
Aaron Lehmann
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
2017-03-16 11:20:31 -07:00
Daniel Nephin
db27025447
Fix compose schema id for v3.2
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: d0fb25319b
2017-03-16 13:53:58 -04:00
Pure White
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
2017-03-16 23:11:57 +08:00
Sebastiaan van Stijn
c74c88f8f7
Add missing API version annotations to commands
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: d5d0d7795b
2017-03-16 13:40:12 +01:00
Vincent Demeester
970755e1f9
Merge pull request #31775 from erxian/misleading-default-for-update-monitor-duration-flag
...
misleading default for --update-monitor duration
Upstream-commit: 96551fee53
2017-03-16 10:13:26 +01:00
Vincent Demeester
e19ea1e497
Merge pull request #31866 from gdevillele/pr_service_create
...
improve semantics of utility function in cli/command/service
Upstream-commit: d4ed696179
2017-03-16 10:12:15 +01:00
Akihiro Suda
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
2017-03-16 13:19:32 +09:00
Gaetan de Villele
559c313548
improve semantics of utility function in cli/command/service
...
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com >
Upstream-commit: 59c79325bc
2017-03-15 13:49:52 -07:00
Victor Vieux
2524c32d21
Revert "Planned 1.13 deprecation: email from login"
...
This reverts commit a66efbddb8eaa837cf42aae20b76c08274271dcf.
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
Upstream-commit: bc771127d8
2017-03-15 10:43:18 -07:00
Sebastiaan van Stijn
59194c0035
Merge pull request #31302 from dnephin/purge-orphaned-services
...
Add --prune to stack deploy
Upstream-commit: 69b7bf5e9f
2017-03-15 12:57:06 +01:00
erxian
f462549c13
misleading default for --update-monitor duration
...
Signed-off-by: erxian <evelynhsu21@gmail.com >
Upstream-commit: 88a99ae70e
2017-03-15 14:20:02 +08:00
Anusha Ragunathan
648426f723
Merge pull request #31147 from adshmh/30629-print-escaping-hint-on-invalid-interpolation-format
...
docker stack deploy interpolation format error due to not escaping $ now includes a hint
Upstream-commit: d510306bb7
2017-03-14 17:14:09 -07:00
Daniel Nephin
0ed0e112c4
Add --prune to stack deploy.
...
Add to command line reference.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: b1a98b55af
2017-03-14 16:09:28 -04:00
Daniel Nephin
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
2017-03-14 16:00:43 -04:00
Akihiro Suda
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
2017-03-14 15:59:40 -04:00
Victor Vieux
37cb7be49a
Merge pull request #31809 from vieux/bump_api
...
bump API to 1.28
Upstream-commit: 5ce6afc459
2017-03-14 11:53:52 -07:00
Daniel Nephin
72f1866047
Merge pull request #31795 from dnephin/compose-file-v3.2
...
Compose file v3.2
Upstream-commit: d1fc5acc2e
2017-03-14 14:10:24 -04:00
Justin Cormack
fb5e1898c8
Merge pull request #30597 from dnephin/add-expanded-mount-format-to-stack-deploy
...
Add expanded mount format to stack deploy
Upstream-commit: b8c49df008
2017-03-14 17:53:28 +00:00
Victor Vieux
29417b0159
bump API to 1.28
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
Upstream-commit: a972d43e48
2017-03-14 09:32:50 -07:00
Vincent Demeester
2e62b306a8
Merge pull request #31500 from dperny/fix-service-logs-cli
...
Add tail and since to service logs
Upstream-commit: 7ce0cb0cf0
2017-03-14 14:19:29 +01:00
Madhu Venugopal
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
2017-03-13 21:12:32 -07:00
Santhosh Manohar
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
2017-03-13 17:52:08 -07:00
Brian Goff
15bb8a00b0
Merge pull request #31672 from dperny/service-logs-formatting
...
Service logs formatting
Upstream-commit: 8b3bfc15c3
2017-03-13 19:08:55 -04:00
Daniel Nephin
6f96d531a0
Add compose file version 3.2
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 2e9b15143a
2017-03-13 16:20:42 -04:00
Daniel Nephin
29b6bbfa5e
Refactor container run cli command.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 4e388c22d3
2017-03-13 16:05:51 -04:00
Daniel Nephin
74ffacfbac
Move endpoint_mode under deploy and add it to the schema.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 33bfb1e5e5
2017-03-13 15:00:56 -04:00
allencloud
a4dea23f9c
support both endpoint modes in stack
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: cd1cde6e77
2017-03-13 15:00:49 -04:00
Justin Cormack
fe5268e5c2
Merge pull request #31579 from ijc25/cpuacct
...
Correct CPU usage calculation in presence of offline CPUs and newer Linux
Upstream-commit: b786563826
2017-03-13 16:32:18 +00:00
Vincent Demeester
69b02a7f96
Merge pull request #30788 from ripcurld0/hide_win_opts
...
Hide command options that are related to Windows
Upstream-commit: 278e4ccdc5
2017-03-13 16:15:29 +01:00
Sebastiaan van Stijn
c0c565ca20
Merge pull request #30648 from allencloud/do-not-fail-fast-when-inspect
...
do not fail fast when executing inspect command
Upstream-commit: be1855fac4
2017-03-13 16:04:04 +01:00
Boaz Shuster
0069d4e4ab
Hide command options that are related to Windows
...
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com >
Upstream-commit: c7dd91faf5
2017-03-12 08:47:17 +02:00
Sebastiaan van Stijn
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
2017-03-11 01:59:43 +01:00
Tibor Vass
f1c4ad2523
Merge pull request #30047 from duglin/distError
...
Add the mediaType to the error
Upstream-commit: 2881566c4a
2017-03-10 16:44:49 -08:00
Drew Erny
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
2017-03-10 14:59:00 -08:00
Vincent Demeester
17822109ce
Merge pull request #31582 from dnephin/misc-flag-cleanup
...
Cleanup some memory flags used in the CLI
Upstream-commit: be3e4bbe77
2017-03-10 14:16:42 +01:00
Ian Campbell
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
2017-03-10 10:24:33 +00:00
allencloud
405e3ec554
do not fail fast when executing inspect command
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 49570cf783
2017-03-10 16:09:09 +08:00
Ying Li
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
2017-03-09 11:19:20 -08:00
Harald Albers
c668006191
Fix description of docker run|create --stop-signal in help message
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 50a10e9bf4
2017-03-09 09:32:16 +01:00
Drew Erny
ca1b295553
Fixed concerns, updated, and rebased PR.
...
Signed-off-by: Drew Erny <drew.erny@docker.com >
Upstream-commit: 3cda347b3d
2017-03-08 16:35:58 -08:00
Andrea Luzzardi
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
2017-03-08 14:08:04 -08:00
Sebastiaan van Stijn
e6440da44a
Merge pull request #31443 from james-nesbitt/export-more-compose-methods
...
exported add. cli compose loader parsing methods
Upstream-commit: 889f0259c2
2017-03-08 15:12:42 +01:00
Brian Goff
898ec88eed
Merge pull request #31258 from dnephin/fix-override-default-stack-network
...
Support customizing the default network for a stack
Upstream-commit: f6f52d0823
2017-03-07 14:28:16 -05:00
Arash Deshmeh
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
2017-03-07 14:21:45 -05:00
James Nesbitt
22f2b40227
exported cli compose loader parsing methods
...
Signed-off-by: James Nesbitt <james.nesbitt@wunderkraut.com >
Upstream-commit: b6f45eb18e
2017-03-07 17:36:35 +02:00
Daniel Nephin
20f2e36290
Use opts.MemBytes for flags.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: e43a97cd38
2017-03-07 10:32:49 -05:00
Daniel Nephin
92345732e9
Some things just need to be line wrapped.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 2238492c51
2017-03-06 16:01:57 -05:00
Daniel Nephin
19021e1a48
Convert new compose volume type to swarm mount type
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 63c3221dd3
2017-03-06 11:45:01 -05:00
Daniel Nephin
53c21bb298
Support expanded mounts in Compose loader
...
Add a test for loading expanded mount format.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 29f39ea244
2017-03-06 11:45:01 -05:00
Sebastiaan van Stijn
Aaron Lehmann
Daniel Nephin
Pure White
Sebastiaan van Stijn
Vincent Demeester
Akihiro Suda
Gaetan de Villele
Victor Vieux
erxian
Anusha Ragunathan
Daniel Nephin
Justin Cormack
Madhu Venugopal
Santhosh Manohar
Brian Goff
allencloud
Boaz Shuster
Tibor Vass
Drew Erny
Ian Campbell
Ying Li
Harald Albers
Andrea Luzzardi
Arash Deshmeh
James Nesbitt