66e58fd23d
Add support for tty in composefile v3
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: de15de6b4d90f8d707d92ab2f8b6a63e0742e8ce
Component: engine
2016-11-11 11:27:21 +01:00
4d7a48f6ec
Merge pull request #27955 from mlaventure/runc-docker-info
...
Add external binaries version to docker info
Upstream-commit: 0427afa409f1a2034537b4659bf7a3a1454fa617
Component: engine
2016-11-10 21:27:14 -08:00
e297f40024
Merge pull request #28235 from dmcgowan/fix-registry-authorization-errors
...
Fix registry authorization errors
Upstream-commit: 48a0c3e831a13c48a2e64558ff38a79b22881f85
Component: engine
2016-11-10 19:39:28 -08:00
b688822593
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: 14ac9f60d0174256e0713701ebffaf5ca827da71
Component: engine
2016-11-10 18:07:55 -08:00
ca36766d89
Merge pull request #27998 from dnephin/compose-on-swarm
...
Support `docker stack deploy` from a Compose file
Upstream-commit: 750d634d62689bf45ecbb4ae34094ad6a5a7fce5
Component: engine
2016-11-10 17:59:57 -08:00
d159a5119b
Merge pull request #28231 from yuexiao-wang/container-exec
...
Remove redundant parameter and fix typos
Upstream-commit: 891e03eb7dc3b3e5a22efa21f76a5ae1e35cc03b
Component: engine
2016-11-11 09:55:42 +08:00
874be028c3
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: c85eb008416f352327b67dce351101591cd5f781
Component: engine
2016-11-10 17:34:12 -08:00
3baa399d95
Merge pull request #28226 from vieux/exit_exp_plugin
...
move plugins out of experimental
Upstream-commit: acd6e0d9b25c9c8ee4e9a39a69a2a2ac8c1125ec
Component: engine
2016-11-10 17:30:54 -08:00
3213314d62
Merge pull request #28031 from yongtang/27902-extra-hosts
...
Add flag `--host` to `service create` and `--host-add/rm` to `service update`
Upstream-commit: bed96ce922da5fa9df98b826ff0e4ad4bf375a31
Component: engine
2016-11-10 16:55:29 -08:00
fadae43674
move plugins out of experimental
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: c410222e42fb9195909390337bc129c6481e2453
Component: engine
2016-11-10 15:51:32 -08:00
0d1faa11e0
Merge pull request #28089 from aluzzardi/service-logs
...
service logs
Upstream-commit: 5f9fe54b35cf64181c62a8faec8651c6a25fcc95
Component: engine
2016-11-10 15:13:41 -08:00
510a237f2b
Merge pull request #28253 from aaronlehmann/arg-descriptions
...
cli: Change autolock flag description
Upstream-commit: 0151fb7618ee7cd0bb7de213c604257cf5e3dc92
Component: engine
2016-11-10 13:59:46 -08:00
050cbb7ecd
cli: docker service logs support
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
Upstream-commit: c7995fdc7760c23cdbed0fa4ca229517c71dba82
Component: engine
2016-11-10 13:46:02 -08:00
ef501816c9
Merge pull request #27797 from vdemeester/stats-format-names-support
...
Add support for Names and ID in stats format
Upstream-commit: 801230ce315ef51425da53cc5712eb6063deee95
Component: engine
2016-11-10 13:26:00 -08:00
d5ff009b23
Implement ipamconfig.subnet and be more explicit about restart policy always.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: dfd1227906a74acd51daed906802424299bda3bc
Component: engine
2016-11-10 16:22:31 -05:00
9ee3779eb4
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: 41b84e0994f9ec72990b7f0fc758f602f6241bc6
Component: engine
2016-11-10 12:05:19 -08:00
6e2afbaf59
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: ea9a23ccdbd3a861e4cfa3441482b448fd1c17a5
Component: engine
2016-11-10 10:20:24 -08:00
cd96217228
Merge pull request #28243 from andrewhsu/change-context
...
use "golang.org/x/net/context" instead of "context"
Upstream-commit: 02918908af98d95652668f015275747907e78c68
Component: engine
2016-11-10 19:13:56 +01:00
7b76246b62
Merge pull request #28148 from vieux/rename_plugin_manifest
...
rename plugin manifest
Upstream-commit: 89cc35447d96f6dbd5503d76883c33742076ca10
Component: engine
2016-11-10 09:47:15 -08:00
4c746a53ae
Handle bind options and volume options
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: ef90081d44f204727254c4ae5f0b4910a77530fd
Component: engine
2016-11-10 12:37:17 -05:00
80cefc6683
Restore stack deploy integration test with dab
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: bd8de8d8be9e367af9e045d0fdead4462fed490c
Component: engine
2016-11-10 11:28:19 -05:00
f16c51a10e
Reinstate --bundle-file argument to 'docker deploy'
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
Upstream-commit: aa5e7d038a5459df55f5c039d4a881a4558aa247
Component: engine
2016-11-10 11:28:18 -05:00
3a6b62c164
Add integration test for stack deploy.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: eefccc25c5cda96947978c503d5764aa48aacd7d
Component: engine
2016-11-10 11:28:18 -05:00
2d56062821
Remove bundlefile
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: b45581b78610e9fe41b8fde19188868aac6df250
Component: engine
2016-11-10 11:28:18 -05:00
184722486c
Remove duplication of name mangling.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 46ca5827f99e627d7b63433497aee145c1d0468e
Component: engine
2016-11-10 11:28:18 -05:00
36eb40263d
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: 644d30369a348db4d904d86958c2b57a0de36990
Component: engine
2016-11-10 11:28:18 -05:00
1908145b38
Send warnings to stderr.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: b0efbcc34a77d5d8869cc381064d3741b67f9776
Component: engine
2016-11-10 11:28:18 -05:00
787c19b18c
Default to replicated mode
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
Upstream-commit: 3d2cb23782da72f650da438b11d4db87ccdbb596
Component: engine
2016-11-10 11:28:18 -05:00
15d5c8d4af
Handle unsupported, deprecated and forbidden properties
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
Upstream-commit: fcad58f3c85145f0414ffba72321bbb10d16e272
Component: engine
2016-11-10 11:28:18 -05:00
941e9ca594
Add swarmkit fields to stack service.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 13384ba34b8d57d9cc6e68ff9c8b0b72bc72f9c3
Component: engine
2016-11-10 11:28:18 -05:00
860efa419b
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: 0884e3c86892a0f51b8feeeb30ff486c821796f5
Component: engine
2016-11-10 11:28:18 -05:00
52cbc60fd5
Convert deploy to use a compose-file.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: cbbc6b4d9bd50f7409c6d935efc899946c449de3
Component: engine
2016-11-10 11:28:18 -05:00
136327ac5a
use "golang.org/x/net/context" instead of "context"
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
Upstream-commit: 2de83a430d5d3f82346cafa15f4bd1f7c47dde12
Component: engine
2016-11-10 08:23:19 -08:00
8bb2169ed5
Merge pull request #28186 from yongtang/27567-follow-up-dns-options
...
Add `--dns-option` to `docker run` and hide `--dns-opt`
Upstream-commit: 33af4dd505aac709d607d26fc19a16d3dffdd66e
Component: engine
2016-11-10 16:20:17 +01:00
6949dd3368
rename plugin manifest
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 49ca91fbebbea80587ce3c0814bba3b41cce14a0
Component: engine
2016-11-10 00:09:23 -08:00
be247ad0fb
Merge pull request #28224 from vieux/fix_manpages
...
fix manpages
Upstream-commit: d286734b41cf3811021c5347412b8094638c0adc
Component: engine
2016-11-09 23:22:30 -08:00
f3074c32a8
Remove redundant parameter and fix typos
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 713cae7ca2b8a5fa36e25f3fb30531f6400fafc3
Component: engine
2016-11-10 11:05:31 +08:00
62ec0be101
Merge pull request #28164 from anusha-ragunathan/plugin-build
...
Add plugin create functionality.
Upstream-commit: 28a1ea342d1f227664ad30ffd05eaaab8c9ef93e
Component: engine
2016-11-09 17:49:51 -08:00
c27b5695c1
fix manpages
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 8e701f0bd7f6be30d8b23010b2a7daf8e15981ec
Component: engine
2016-11-09 17:11:14 -08:00
2394a196a1
Add unlock key rotation
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: a6030a50c95cd4e8b39b5f4d5705bb23ebdb28c5
Component: engine
2016-11-09 16:09:01 -08:00
0827ead1b6
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: 0f9fc54df9274327ed22f4e07f0981a648e0278a
Component: engine
2016-11-09 16:09:00 -08:00
2874df7efa
Add support for swarm init lock and swarm unlock
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: b4a667c8c4f536445d35e8914a58e8c749f16ea6
Component: engine
2016-11-09 16:09:00 -08:00
948055475e
Add plugin create functionality.
...
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: 5b6e1bc9e551ba56b44c3f409fd5d48f8a54ce1d
Component: engine
2016-11-09 15:23:03 -08:00
a8a11f6c62
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: 9b6b3c2076911ea0a510548943180ac9d1b8c286
Component: engine
2016-11-09 12:13:25 -08:00
807eb50cc6
use human readable units when listing secrets
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
Upstream-commit: 880e8be1eea086ee83e5ad22f953696365c5b799
Component: engine
2016-11-09 14:27:46 -05:00
bd20a72add
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: 427c70d97779566b2b3ea3a9141bb9bf3dd05dd8
Component: engine
2016-11-09 14:27:45 -05:00
5cd25dda5d
SecretRequestOptions -> SecretRequestOption
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
Upstream-commit: 5b2230a38b357a3e2725fc56be9c07c01fd1203e
Component: engine
2016-11-09 14:27:45 -05:00
19e0a8c065
support labels for secrets upon creation; review updates
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
Upstream-commit: 583c013a8735031f4e5090bb1699effb64daf950
Component: engine
2016-11-09 14:27:45 -05:00
d31e5eafbe
secrets: support simple syntax --secret foo
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
Upstream-commit: a257f674ba22d325e7ad59541723c3ee4e9adc27
Component: engine
2016-11-09 14:27:45 -05:00
e093728442
review updates
...
- use Filters instead of Filter for secret list
- UID, GID -> string
- getSecrets -> getSecretsByName
- updated test case for secrets with better source
- use golang.org/x/context instead of context
- for grpc conversion allocate with make
- check for nil with task.Spec.GetContainer()
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
Upstream-commit: b2e4c7f3b5b30fc6940768ec41836d708a48b463
Component: engine
2016-11-09 14:27:45 -05:00
