f08872faee
Merge pull request #24525 from vdemeester/24196-remove-command-flag-on-service-update
...
Remove --command flag for service update
Upstream-commit: 58624acf11405c482ff0abbc9674cd5441ccce57
Component: engine
2016-07-13 16:01:11 +00:00
1348489290
Remove --command flag for service update
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: e4a024d5902df1d3db8b9fff8865304afa2305e6
Component: engine
2016-07-13 16:19:21 +02:00
891b2576ba
Merge pull request #24562 from thaJeztah/carry-24499-swarm-info-consistency
...
[carry 24499] Remove "Yes"/"No" and use "true"/"false" consistently in `docker info`
Upstream-commit: 92b15778712ff2eb85bf5b7e00fb4fe4310fd6b1
Component: engine
2016-07-13 15:13:58 +02:00
937633217f
Make labels human readable
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: ea365e4cb37d037046364773d01a744b1258ce4e
Component: engine
2016-07-13 01:08:54 +02:00
36cae188de
Merge pull request #24146 from johnharris85/fix-swarm-update-auto-accept
...
Add comma-separated --auto-accept support.
Upstream-commit: 7da11b1afda5f42d07b7304a7edcd1886434d9ed
Component: engine
2016-07-12 16:29:21 +02:00
9557e1e984
Merge pull request #24501 from hqhq/remove_exec_driver
...
Remove execution driver
Upstream-commit: 880484992c360881dc57a3317b84d75300c358af
Component: engine
2016-07-11 16:54:36 -07:00
cb38cf39e2
Add support for comma-separated --auto-accept syntax.
...
Signed-off-by: John Harris <john@johnharris.io >
Upstream-commit: 8e148827734a94165156adfd0f6d202d28dff142
Component: engine
2016-07-11 15:47:04 -07:00
399c37eb85
Merge pull request #24051 from allencloud/return-err-when-stack-name-nonexist
...
output some details when stack name does not exist
Upstream-commit: 46649755f8771e38b2c74352327a226f1c995843
Component: engine
2016-07-11 20:43:09 +02:00
04c06a5318
return err when stack name does not exist
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 416613f2e54581c62d3efa1c4f0288b6e7d58365
Component: engine
2016-07-12 00:59:30 +08:00
0d1aeb8407
Remove "Yes"/"No" and use "true"/"false" consistently in docker info
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: c6b7bd1aa6b94ab242d6310419f1c3a7964ffa02
Component: engine
2016-07-11 06:55:30 +00:00
abbe69120e
Remove execution driver
...
We use containerd and there is no execution driver anymore.
Addresses: https://github.com/docker/docker/issues/24461
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: 1fb1136fecfd761300a38f64ac9178979cc0b270
Component: engine
2016-07-11 14:52:27 +08:00
1f5dadc0e0
Merge pull request #24389 from Microsoft/jjh/silentsecurity
...
Windows: No security warning on quiet
Upstream-commit: db435560b38e4489ff3b0a8031d7b5110961fd32
Component: engine
2016-07-08 11:06:33 -07:00
d206128458
Windows: No security warning on quiet
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: a9b3c1d7207e8c4b46b6f7efb3bf5bc3b5160c83
Component: engine
2016-07-07 16:00:08 -07:00
a83cb2f41d
Merge pull request #24291 from vdemeester/docs-cli-reference-updates
...
Updates on cli reference documentation
Upstream-commit: b98ba9a1d66d9b82eec510fb60a1ff7d7f2e7b0f
Component: engine
2016-07-07 14:28:54 -07:00
d634daae27
Updates on cli reference documentation
...
- Update ps with `--last` flag
- Update commands with current output
- Make sure hugo does not detect the wrong language
- Update usage for `tag` command to be more coherent with the other ones
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: f4cfc6b9830ed236eb588d6a4dddca7455145e70
Component: engine
2016-07-07 20:43:18 +02:00
a5fef9cf19
Merge pull request #24349 from aaronlehmann/swarm-secrets-by-default
...
Generate a swarm joining secret if none is specified
Upstream-commit: db67db98d837517123abf7f3efbb04d0bec3708b
Component: engine
2016-07-07 11:43:08 -07:00
f5a13a7cbe
Use "on-failure" for both containers and services
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: a859a336475f39c7b7d7739c58a1dae40df86a86
Component: engine
2016-07-07 11:32:19 +02:00
c201e7c4a2
Merge pull request #24053 from cpuguy83/mounts_default_writable
...
Change defaults for mount writable and volume copying
Upstream-commit: 50674ec107a300067ded77912a2e39de88678c2c
Component: engine
2016-07-07 11:18:14 +02:00
7ac01fb32e
Use newer default values for mounts CLI
...
In the API:
`Writable` changed to `ReadOnly`
`Populate` changed to `NoCopy`
Corresponding CLI options updated to:
`volume-writable` changed to `volume-readonly`
`volume-populate` changed to `volume-nocopy`
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 56f3422468a0b43da7bae7a01762ce4f0a92d9ff
Component: engine
2016-07-06 22:34:39 -04:00
892399249d
re-vendor engine-api
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 140ec59db6e413de5025fb8686b97bf80b66c519
Component: engine
2016-07-06 21:14:14 -04:00
08bcf7365f
Generate a swarm joining secret if none is specified
...
The current behavior of `docker swarm init` is to set up a swarm that
has no secret for joining, and does not require manual acceptance for
workers. Since workers may sometimes receive sensitive data such as pull
credentials, it makes sense to harden the defaults.
This change makes `docker swarm init` generate a random secret if none
is provided, and print it to the terminal. This secret will be needed to
join workers or managers to the swarm. In addition to improving access
control to the cluster, this setup removes an avenue for
denial-of-service attacks, since the secret is necessary to even create
an entry in the node list.
`docker swarm init --secret ""` will set up a swarm without a secret,
matching the old behavior. `docker swarm update --secret ""` removes the
automatically generated secret after `docker swarm init`.
Closes #23785
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 7342e42fcecbc243bcb8723b8422879662452017
Component: engine
2016-07-06 13:04:50 -07:00
b214ee32d9
make docker service --help text for --endpoint-mode more consistent
...
Previously:
```
--constraint value Placement constraints (default [])
--endpoint-mode string Endpoint mode(Valid values: vip, dnsrr)
<snip>
--restart-condition string Restart when condition is met (none, on_failure, or any)
```
Now:
```
--constraint value Placement constraints (default [])
--endpoint-mode string Endpoint mode (vip or dnsrr)
<snip>
--restart-condition string Restart when condition is met (none, on_failure, or any)
```
Signed-off-by: Anil Madhavapeddy <anil@docker.com >
Upstream-commit: 2de9585f5ea798cbff23045d9d19ba239d5e5431
Component: engine
2016-07-06 12:10:28 +01:00
e4dfc2d04c
Validate hostname starting from 1.24 API.
...
In order to keep a little bit of "sanity" on the API side, validate
hostname only starting from v1.24 API version.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 6daf3d2a783fd042e870c8af8bbd19fc28989505
Component: engine
2016-07-06 09:13:59 +02:00
5cc35f4af8
Merge pull request #24351 from allencloud/add-file-close-in-loadBundlefile
...
fix severe fd leak in stack
Upstream-commit: ad44f49470bec84143ce73f51698bc9bbb501425
Component: engine
2016-07-05 17:45:34 -07:00
16a17d551d
fix severe fd leak in stack
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 0af04b613220060ef1fc21ca2f1d551f8f868af8
Component: engine
2016-07-06 07:00:39 +08:00
48bf87974d
Merge pull request #24158 from mavenugo/smissues
...
Fixed a few network UI issues in swarm-mode
Upstream-commit: 5b4131681595b6f5304f3d94868a1642f92f2998
Component: engine
2016-07-05 20:28:20 +00:00
bf5c518081
Merge pull request #24013 from dmcgowan/atomic-libtrust-key-file-write
...
Atomically save libtrust key file
Upstream-commit: 97aebe9a6c301bd7836042a171bfaae5652979fd
Component: engine
2016-07-05 15:28:41 -04:00
f3ff9e9f18
Merge pull request #24173 from vdemeester/tasks-filter-service-node-by-name
...
Allow service and node filter to be name in `tasks` subcommands
Upstream-commit: db75aa029d1843b3fdabb16c5cd9e1b3a99f39b2
Component: engine
2016-07-05 12:16:57 -07:00
cfca5f9c64
Merge pull request #24298 from allencloud/fix-stdout-and-stderr-in-api-client
...
fix stdout and stderr in api client
Upstream-commit: a44e0fedc2b69944f764dc82134e8aa0d12bde5d
Component: engine
2016-07-05 09:58:25 -07:00
4306c5def3
Merge pull request #24191 from tonistiigi/mask-secrets
...
Mask swarm secrets from daemon logs
Upstream-commit: 55b8216279b40f6712ccdd46a6e2ac73c4bdbba0
Component: engine
2016-07-05 08:56:33 -07:00
60d7b2e452
fix stdout and stderr in api client
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 533bd82e41fee352962cb5ae0a49b9edbdebc25e
Component: engine
2016-07-05 23:07:40 +08:00
66c27a36a6
23837 Added long flag to docker ps for checking latest n containers. Updated to "--last"
...
Signed-off-by: Shoubhik Bose <sbose78@gmail.com >
Upstream-commit: 256edc24fc8f32a93a0572e5d05f3ca1389238da
Component: engine
2016-07-02 19:15:01 +00:00
96e6b59e3f
Improve timestamp formatting
...
lowercase the output, to prevent "About" halfway,
and add "ago" to the output, as timestamps are always
in the past.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 04c94a013ccba1690933156830efdc314de67ef8
Component: engine
2016-07-01 17:55:52 -07:00
db7f1cc524
Merge pull request #24128 from thaJeztah/rename-desired_state-filter
...
rename desired_state filter to desired-state
Upstream-commit: b8988824616017a7ff4a13475dde23f7677aa21c
Component: engine
2016-07-01 18:34:02 +02:00
bda6fa8f54
Add support for external CAs
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 11085b2260a78b3248f3e98e0a1e3203431fae22
Component: engine
2016-06-30 17:22:47 -07:00
b73379e968
Update to new swarmkit/engine-api
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 9b652738363d92fbe6e43b3981cdcc94bdb72c76
Component: engine
2016-06-30 17:22:47 -07:00
e32550579c
Merge pull request #23584 from nishanttotla/private-images-swarm-services
...
Passing registry auth token for service create, update
Upstream-commit: 8fe6480c8a26f80fe174ae93e1b380bb7ec6083c
Component: engine
2016-06-30 17:18:59 -07:00
c8d0fdbe96
Mask swarm secrets from daemon logs
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 8b8f86aec95ec73881c2dfb6e990784014d61e6e
Component: engine
2016-06-30 17:11:09 -07:00
9f0a770513
Adding a flag to specify sending of registry auth
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com >
Upstream-commit: 538bac39d7fe93562922b89e9a294096be48fb59
Component: engine
2016-06-30 14:59:32 -07:00
6b4b42d73a
rename desired_state filter to desired-state
...
For consistency with other filters (such as
"is-official"), this renames the desired_state
filter to "desired-state".
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: d761719eb4e45fbd6f092f6d0b4eb42206e298f6
Component: engine
2016-06-30 14:49:46 -07:00
c93d8a8a0f
Merge pull request #24125 from vdemeester/24117-node-task-filter
...
Fix --filter=desired_state behaviour
Upstream-commit: 9d18fda08d3ae4d9654f1fc1ec7a1f8afefebf75
Component: engine
2016-06-30 14:08:05 -07:00
36333fbd7e
Merge pull request #24175 from allencloud/fix-comments-and-handle-err
...
fix comments and handle err
Upstream-commit: cbc4fd2131d06c0342a330843a02632034f1db7b
Component: engine
2016-06-30 19:22:47 +02:00
edfdc3750d
Merge pull request #24159 from yongtang/24090-docker-node-list-hostname
...
Use HOSTNAME in the output of `docker node ls`
Upstream-commit: 0f687aafafb1b3f3503e71e6a04e766cc85f4372
Component: engine
2016-06-30 09:28:57 -07:00
5af62950c4
Merge pull request #24174 from runcom/fix-grammar
...
fix warn message typos
Upstream-commit: e84b91d8f5859778f43b03890e79b02610d82841
Component: engine
2016-06-30 17:05:06 +02:00
9ea890bdf9
Merge pull request #24171 from allencloud/make-cmd-short-consistency
...
make cmd short consistency
Upstream-commit: 294791e9ed36eff4b93d6cec0da9ed3ed805d549
Component: engine
2016-06-30 16:59:32 +02:00
24d57a19bb
fix comments and handle err
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: cc054f3195308da471c252d755dacfe446cb1066
Component: engine
2016-06-30 21:53:20 +08:00
939b820305
make cmd short short consistency and change docs
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 184afb92bf0bda1f47b5e1812ee1134328e272e2
Component: engine
2016-06-30 21:17:51 +08:00
169947bdeb
fix warn message typos
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: a4143e6756d697323d560396dff6b90168a1e56c
Component: engine
2016-06-30 15:17:37 +02:00
a50f4824a7
Allow service and node filter to be name…
...
… on `docker node tasks` and `docker service tasks` commands.
This changes is mainly server-side (between engine api and
swarmkit). There is just a check in `api/client/service/tasks.go` to
handle the special *self* meaning.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: b0fc5a21f1138f48e0431a550c936e8908d72840
Component: engine
2016-06-30 15:09:03 +02:00
ac805da5d2
Remove dm.no_warn_on_loop_devices in info warning
...
I think we doesn't provide dm.no_warn_on_loop_devices option
at all. I didn't found any code to handle this option.
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 2aa01e0fbc76ecb8cf1a1b608e254e6cb8821ff7
Component: engine
2016-06-30 14:57:46 +08:00
