Commit Graph

295 Commits

Author SHA1 Message Date
71aa7e39fa Suppressing digest for docker service ls/ps
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Upstream-commit: 5f1209bf4b
Component: cli
2016-11-18 09:39:34 -08:00
0d64811356 Merge pull request #28272 from Microsoft/jjh/sequentialscan2
Windows: Perf: Use sequential file access
Upstream-commit: 91aed2e673
Component: cli
2016-11-16 00:47:19 +01:00
3bfbb64933 Merge pull request #26868 from Microsoft/jjh/deprecateemail
1.14 deprecation: email from login
Upstream-commit: 66d50e5695
Component: cli
2016-11-15 13:08:05 +01:00
0112a67d6b Windows: Use sequential file access
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 5723c85b1d
Component: cli
2016-11-14 17:41:52 -08:00
c6cd5c7bf9 Merge pull request #28340 from cpuguy83/28337_fix_template_opts_ps
Fix issue with missing fields for `ps` template
Upstream-commit: dc2eeb6456
Component: cli
2016-11-14 14:25:01 -08:00
e1b7e9bf69 Add docs for plugin push
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: f1598f8b82
Component: cli
2016-11-14 09:10:21 -08:00
2036ffc43b Fix issue with missing fields for ps template
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: d3169abc3b
Component: cli
2016-11-12 11:23:21 -05:00
f1ed942575 context.Context should be the first parameter of a function
Signed-off-by: yupeng <yu.peng36@zte.com.cn>
Upstream-commit: 0f6af2074c
Component: cli
2016-11-12 14:14:34 +08:00
d1393049a2 Planned 1.13 deprecation: email from login
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 4088f3bcff
Component: cli
2016-11-11 17:32:46 -08:00
0a49dfc297 Merge pull request #28306 from ehazlett/service-create-no-secrets
only check secrets for service create if requested
Upstream-commit: 827b121154
Component: cli
2016-11-11 20:58:40 +01:00
ed0d9295fd Merge pull request #28042 from yongtang/28018-docker-info-swarm-managers
Add information for `Manager Addresses` in the output of `docker info`
Upstream-commit: 460a7e213c
Component: cli
2016-11-11 09:30:01 -08:00
a3bd1bfe20 Merge pull request #27872 from vdemeester/images-filter-filters
Add reference filter and deprecated filter param…
Upstream-commit: 356ff43768
Component: cli
2016-11-11 11:24:19 -05:00
d39fb19105 Merge pull request #28297 from vdemeester/compose-swarm-openstdin
Add support for stdin_open in compose to swarm
Upstream-commit: 57da27f76c
Component: cli
2016-11-11 17:09:04 +01:00
cf7711be4d Add information for Manager Addresses in the output of docker info
As is specified in 28018, it would be useful to know the manager's addresses
even in a worker node. This is especially useful when there are many
worker nodes in a big cluster.

The information is available in `info.Swarm.RemoteManagers`.

This fix add the information of `Manager Addresses` to the output
of `docker info`, to explicitly show it.

A test has been added for this fix.

This fix fixes 28018.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: cd71257cfd
Component: cli
2016-11-11 07:35:32 -08:00
ea03f9e605 only check secrets for service create if requested
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: 885c5f1747
Component: cli
2016-11-11 10:07:24 -05:00
d6a4ee3c7d Add reference filter and deprecated filter param…
… for `docker images`.

This deprecates the `filter` param for the `/images` endpoint and make a
new filter called `reference` to replace it. It does change the CLI
side (still possible to do `docker images busybox:musl`) but changes the
cli code to use the filter instead (so that `docker images --filter
busybox:musl` and `docker images busybox:musl` act the same).

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 3c61af0f76
Component: cli
2016-11-11 15:34:01 +01:00
a03dcc83b4 Add support for extra_hosts in composefile v3
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 84a795bf05
Component: cli
2016-11-11 15:20:02 +01:00
03ba4d6a33 Add support for stdin_open in composefile v3
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: f24ff647e1
Component: cli
2016-11-11 15:19:00 +01:00
ea25b45846 Add support for tty in composefile v3
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 356421b7da
Component: cli
2016-11-11 11:27:21 +01:00
8dad3fef6f Merge pull request #27955 from mlaventure/runc-docker-info
Add external binaries version to docker info
Upstream-commit: 19c8941f2f
Component: cli
2016-11-10 21:27:14 -08:00
bfae681497 Merge pull request #28235 from dmcgowan/fix-registry-authorization-errors
Fix registry authorization errors
Upstream-commit: 795e487513
Component: cli
2016-11-10 19:39:28 -08:00
69a2e4be9f Add support for host port PublishMode in services
Add api/cli support for adding host port PublishMode in services.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: 148dc157f6
Component: cli
2016-11-10 18:07:55 -08:00
89896ee078 Merge pull request #27998 from dnephin/compose-on-swarm
Support `docker stack deploy` from a Compose file
Upstream-commit: 7d89ba2d9d
Component: cli
2016-11-10 17:59:57 -08:00
a99e0f963e Merge pull request #28231 from yuexiao-wang/container-exec
Remove redundant parameter and fix typos
Upstream-commit: 005a3037de
Component: cli
2016-11-11 09:55:42 +08:00
bfaa4fa163 Update for distribution vendor
Handle updates to reference package.
Updates for refactoring of challenge manager.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 43bcd982cd
Component: cli
2016-11-10 17:34:12 -08:00
706abe7be6 Merge pull request #28226 from vieux/exit_exp_plugin
move plugins out of experimental
Upstream-commit: 63167f17b0
Component: cli
2016-11-10 17:30:54 -08:00
f380f55b88 Merge pull request #28031 from yongtang/27902-extra-hosts
Add flag `--host` to `service create` and `--host-add/rm` to `service update`
Upstream-commit: 32beb80f99
Component: cli
2016-11-10 16:55:29 -08:00
66e137540f move plugins out of experimental
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: f5cea67e33
Component: cli
2016-11-10 15:51:32 -08:00
63c698af23 Merge pull request #28089 from aluzzardi/service-logs
service logs
Upstream-commit: 79e1fd01ce
Component: cli
2016-11-10 15:13:41 -08:00
3a62a7e49b Merge pull request #28253 from aaronlehmann/arg-descriptions
cli: Change autolock flag description
Upstream-commit: d04c77bdae
Component: cli
2016-11-10 13:59:46 -08:00
0caec6c7c4 cli: docker service logs support
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Upstream-commit: b059cf5286
Component: cli
2016-11-10 13:46:02 -08:00
16caab97a6 Merge pull request #27797 from vdemeester/stats-format-names-support
Add support for Names and ID in stats format
Upstream-commit: 6bf79deab5
Component: cli
2016-11-10 13:26:00 -08:00
2dbf6f72b0 Implement ipamconfig.subnet and be more explicit about restart policy always.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: cb1783590c
Component: cli
2016-11-10 16:22:31 -05:00
c0ed996a0b cli: Change autolock flag description
This change incorporates feedback from @thaJeztah in the PR that added
the autolock flag. It changes the descriptions to be different for
"swarm init" and "swarm update" so that the boolean nature so that the
purpose of the flag in both contexts is clearer.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: fd5673eeb9
Component: cli
2016-11-10 12:05:19 -08:00
1026429c8f Add flag --host to service create and --host-add/--host-rm to service update
This fix tries to address 27902 by adding a flag `--host`
to `docker service create` and `--host-add/--host-rm` to
`docker service update`, so that it is possible to
specify extra `host:ip` settings in `/etc/hosts`.

This fix adds `Hosts` in swarmkit's `ContainerSpec` so that it
is possible to specify extra hosts during service creation.

Related docs has been updated.

An integration test has been added.

This fix fixes 27902.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 6f3ee9c568
Component: cli
2016-11-10 10:20:24 -08:00
dab64a7154 Merge pull request #28243 from andrewhsu/change-context
use "golang.org/x/net/context" instead of "context"
Upstream-commit: 82c10dd9f9
Component: cli
2016-11-10 19:13:56 +01:00
27580de9af Merge pull request #28148 from vieux/rename_plugin_manifest
rename plugin manifest
Upstream-commit: fb0e903122
Component: cli
2016-11-10 09:47:15 -08:00
c9fe088e13 Handle bind options and volume options
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 0333117b88
Component: cli
2016-11-10 12:37:17 -05:00
fe7cf88721 Restore stack deploy integration test with dab
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 458ffcd2e6
Component: cli
2016-11-10 11:28:19 -05:00
4821df0ab0 Reinstate --bundle-file argument to 'docker deploy'
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
Upstream-commit: 791b687848
Component: cli
2016-11-10 11:28:18 -05:00
ae6497c7b8 Add integration test for stack deploy.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: d05510d954
Component: cli
2016-11-10 11:28:18 -05:00
681106a47f Remove bundlefile
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 3875355a3e
Component: cli
2016-11-10 11:28:18 -05:00
bab5319d52 Remove duplication of name mangling.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: ef845be6a5
Component: cli
2016-11-10 11:28:18 -05:00
8692a2c8eb Always use a default network if no other networks are set.
also add network labels.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: d89cb4c62f
Component: cli
2016-11-10 11:28:18 -05:00
3474fbaade Send warnings to stderr.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: ae8f001829
Component: cli
2016-11-10 11:28:18 -05:00
002c2a5040 Default to replicated mode
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
Upstream-commit: 25c93d4ebb
Component: cli
2016-11-10 11:28:18 -05:00
7a88ddd32e Handle unsupported, deprecated and forbidden properties
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
Upstream-commit: dfab8f2bd4
Component: cli
2016-11-10 11:28:18 -05:00
aed389c1e8 Add swarmkit fields to stack service.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: e1b96b6447
Component: cli
2016-11-10 11:28:18 -05:00
3054994651 Add support for service-level 'volumes' key
Support volume driver + options
Support external volumes
Support hostname in Compose file

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
Upstream-commit: a9fc9b60fe
Component: cli
2016-11-10 11:28:18 -05:00
ab7cf40180 Convert deploy to use a compose-file.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: f702b722d8
Component: cli
2016-11-10 11:28:18 -05:00