ea03f9e605
only check secrets for service create if requested
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
Upstream-commit: 885c5f1747
2016-11-11 10:07:24 -05:00
ea25b45846
Add support for tty in composefile v3
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 356421b7da
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
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
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
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
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
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
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
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
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
2016-11-10 15:51:32 -08:00
63c698af23
Merge pull request #28089 from aluzzardi/service-logs
...
service logs
Upstream-commit: 79e1fd01ce
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
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
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
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
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
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
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
2016-11-10 19:13:56 +01:00
27580de9af
Merge pull request #28148 from vieux/rename_plugin_manifest
...
rename plugin manifest
Upstream-commit: fb0e903122
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
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
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
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
2016-11-10 11:28:18 -05:00
681106a47f
Remove bundlefile
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 3875355a3e
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
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
2016-11-10 11:28:18 -05:00
3474fbaade
Send warnings to stderr.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: ae8f001829
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
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
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
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
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
2016-11-10 11:28:18 -05:00
3f3a95ef3e
use "golang.org/x/net/context" instead of "context"
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
Upstream-commit: dc32cb6c77
2016-11-10 08:23:19 -08:00
dd6a352b1e
Merge pull request #28186 from yongtang/27567-follow-up-dns-options
...
Add `--dns-option` to `docker run` and hide `--dns-opt`
Upstream-commit: c5fbdc8572
2016-11-10 16:20:17 +01:00
3aca7843a9
rename plugin manifest
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 0ae9598f96
2016-11-10 00:09:23 -08:00
317a3879fc
Merge pull request #28224 from vieux/fix_manpages
...
fix manpages
Upstream-commit: e876381912
2016-11-09 23:22:30 -08:00
31f3e07b0b
Remove redundant parameter and fix typos
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: b6fe99530c
2016-11-10 11:05:31 +08:00
781f497519
Merge pull request #28164 from anusha-ragunathan/plugin-build
...
Add plugin create functionality.
Upstream-commit: 1a34843c0c
2016-11-09 17:49:51 -08:00
90efedd5e2
fix manpages
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 96c16101dd
2016-11-09 17:11:14 -08:00
f93e810a9b
Add unlock key rotation
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 65e1e166ee
2016-11-09 16:09:01 -08:00
c3469cb075
Revise swarm init/update flags, add unlocking capability
...
- Neither swarm init or swarm update should take an unlock key
- Add an autolock flag to turn on autolock
- Make the necessary docker api changes
- Add SwarmGetUnlockKey API call and use it when turning on autolock
- Add swarm unlock-key subcommand
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 56b7ad90b1
2016-11-09 16:09:00 -08:00
fc02a64b8c
Add support for swarm init lock and swarm unlock
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: d006a04357
2016-11-09 16:09:00 -08:00
878834ace0
Add plugin create functionality.
...
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: b825c58ff8
2016-11-09 15:23:03 -08:00
724a0461bc
Add --dns-option to docker run and hide --dns-opt
...
This fix is a follow up to #27567 based on:
https://github.com/docker/docker/pull/27567#issuecomment-259295055
In #27567 , `--dns-options` has been added to `service create/update`,
together with `--dns` and `--dns-search`. The `--dns-opt` was used
in `docker run`.
This fix add `--dns-option` (not `--dns-options`) to `docker run/create`, and hide
`--dns-opt`. It is still possible to use `--dns-opt` with
`docker run/create`, though it will not show up in help output.
This fix change `--dns-options`to --dns-option` for `docker service create`
and `docker service update`.
This fix also updates the docs and bash/zsh completion scripts.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: b38ca0f4c3
2016-11-09 12:13:25 -08:00
b1a6be626a
use human readable units when listing secrets
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
Upstream-commit: 06666a5a23
2016-11-09 14:27:46 -05:00
832247227c
more review updates
...
- return err instead of wrap for update secret
- add omitempty for data in secret spec
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
Upstream-commit: c7d7b50003
2016-11-09 14:27:45 -05:00
00bf1d223d
SecretRequestOptions -> SecretRequestOption
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
Upstream-commit: 0dc9115006
2016-11-09 14:27:45 -05:00
46910777dc
support labels for secrets upon creation; review updates
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
Upstream-commit: 0bda23ec2b
2016-11-09 14:27:45 -05:00
8fd729c7c9
secrets: support simple syntax --secret foo
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
Upstream-commit: b3bbcc1ba6
2016-11-09 14:27:45 -05:00
