eb03440e93
Merge pull request #354 from allencloud/add-string-func-for-NetIPNet
...
add fun String() for NetIPNet
2016-08-09 16:30:54 +02:00
31a6e50881
add fun String() for NetIPNet
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-08-09 15:22:14 +08:00
61712aa11e
Use new mounts API in hostconfig
...
Signed-off-by: Brian Goff <bgoff@cpuguy83-mbp.local>
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-08-08 19:07:36 -04:00
65747baa28
Add Annotations to Task definition
...
This fix is related to docker pull request:
https://github.com/docker/docker/pull/24850
and swarmkit pull request:
https://github.com/docker/swarmkit/pull/1193
Basically, this fix adds Annotations to Task definition so that
Task name could be saved. The Task name is defined as
<ServiceName>.<Slot>.<TaskID>
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-08-04 11:50:26 -07:00
16c66e864c
Merge pull request #348 from Hui-Zhi/correct-grammer-mistake
...
correct grammar mistake
2016-08-03 16:39:42 +02:00
8b04da8099
Add singed off, Signed-off-by: Hui-Zhi <zhaohuizhi@gmail.com>
...
Signed-off-by: Hui-Zhi <zhaohuizhi@gmail.com>
2016-08-03 02:12:19 -04:00
603ec41824
Merge pull request #346 from stevvooe/clarify-user-support
...
container: Config.User field supports "user:group" syntax
2016-08-02 23:24:09 +02:00
69cceed4ae
container: Config.User field supports "user:group" syntax
...
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2016-08-02 14:05:48 -07:00
3a9562061f
Merge pull request #336 from vieux/plugin_rm_force
...
add 'force' parameter to docker plugin rm to remove an active plugin
2016-08-02 17:08:26 +02:00
228c7390a7
Merge pull request #320 from xetorthio/darwin_default
...
Make darwin default docker host the same as unix
2016-07-31 16:45:07 +01:00
4eca04ae18
Merge pull request #341 from diogomonica/adding-force-to-node-remove
...
Adding force to the RemoveNode API
2016-07-29 07:34:18 +02:00
61cb872d9d
Adding force to the RemoveNode API
...
Signed-off-by: Diogo Monica <diogo.monica@gmail.com>
2016-07-28 15:28:07 -07:00
3d1601b9d2
Merge pull request #340 from aaronlehmann/remove-join-tokens-from-info
...
Carry #339 : Remove join-tokens from info
2016-07-27 11:58:13 -07:00
052c50f63b
Remove join-tokens from info
...
join-tokens are not needed for the endpoint
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-07-27 11:50:57 -07:00
dccf10e58a
Merge pull request #338 from mlaventure/godoc-liverestore
...
Rename the info LiveRestore field to LiveRestoreEnabled and document it
2016-07-27 12:02:21 +02:00
719a0f942d
Rename the info LiveRestore to LiveRestoreEnabled and document it
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-07-26 16:50:25 -07:00
a52656d77f
Merge pull request #334 from vdemeester/add-swarm-swarm-to-info
...
Add swarm.Swarm to swarm.Info…
2016-07-25 20:19:27 -07:00
3c6d71a7e8
Merge pull request #335 from mlaventure/add-live-restore-to-info
...
Add LiveRestore field to Info struct
2016-07-25 20:42:58 +02:00
a18e2bede7
Add LiveRestore field to Info struct
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-07-25 10:06:28 -07:00
1ddbc48560
Add swarm.Swarm to swarm.Info…
...
… in order to display Swarm information in the `/info` endpoint.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-07-23 19:29:45 +02:00
53b6b19ee6
Merge pull request #333 from aaronlehmann/rolling-updates
...
Add failure action for rolling updates
2016-07-22 17:52:42 -07:00
14c70cc34b
Add failure action for rolling updates
...
This is the engine-api portion of docker/docker#24943 .
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-07-22 16:30:58 -07:00
ebb728a134
Merge pull request #332 from tiborvass/healthchecks-exit-code-2
...
healthchecks: update comment about exit code 2
2016-07-23 00:59:33 +02:00
033f6a83ae
healthchecks: update comment about exit code 2
...
Signed-off-by: Tibor Vass <teabee89@gmail.com>
2016-07-22 15:55:27 -07:00
f40c9c2b04
Merge pull request #331 from thaJeztah/rename-rotate_xx_token
...
Rename rotate_manager_token to rotateManagerToken
2016-07-22 14:38:27 -07:00
3d90f9ed92
Rename rotate_manager_token to rotateManagerToken
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-22 22:10:38 +02:00
1f04697443
Merge pull request #328 from anusha-ragunathan/plugin-event-type
...
Required api changes for https://github.com/docker/docker/pull/24760
2016-07-22 20:58:35 +02:00
bbd480dd54
add 'force' parameter to docker plugin rm to remove an active plugin
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-07-22 07:08:23 -07:00
1509378937
Required api changes for https://github.com/docker/docker/pull/24760
...
This adds a new event type for plugins.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2016-07-21 11:05:17 -07:00
c977588a28
Merge pull request #327 from aaronlehmann/join-tokens
...
Replace secrets with join tokens
2016-07-20 16:55:22 -07:00
dd4c0a60a1
Replace secrets with join tokens
...
Needed for docker/docker#24823 .
This changes datastructures in accordance with the upstream swarmkit
changes. It also adds flags to SwarmUpdate to allow token rotation.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-07-20 16:13:12 -07:00
c594b866fc
Merge pull request #326 from aaronlehmann/listen-addr
...
Support advertise address and node address
2016-07-20 23:42:15 +02:00
ef8b57d2c0
Support advertise address and node address
...
This makes the engine-api changes to support
https://github.com/docker/docker/pull/24237 .
AdvertiseAddr is added to InitRequest and JoinRequest so a node can
specify a different address to advertise than the one it binds to. This
allows scenarios with NAT to be supported, and also allows binding to a
wildcard address.
NodeAddr in Info allows Docker to expose a node's address.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-07-20 14:16:45 -07:00
55fc2a3c37
Merge pull request #324 from stevvooe/task-defaults-structure
...
api: default log driver goes under task defaults
2016-07-19 20:55:28 +02:00
bc6cbeac4f
Merge pull request #325 from junshuai/patch-1
...
Fix typos in comments
2016-07-19 11:42:33 +02:00
9d1d140237
Fix typos in comments
...
That misplace 'output' and 'error' in the wrong order
Signed-off-by: Junshuai Zhang <dev.junshuai@gmail.com>
2016-07-19 10:38:26 +01:00
becc5f2501
api: default log driver goes under task defaults
...
In general, we'd like to avoid pollute the top-level space of the
cluster configuration with specific items. This parameterizes task
creation using a `TaskDefaults` subsection. It is arguable that this is
part of the orchestrator, but it is possible to allow task creation
outside of the orchestrator in the future.
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2016-07-18 11:40:29 -07:00
d505506c67
Merge pull request #322 from stevvooe/cluster-level-log-driver
...
types/swarm: move default log driver under orchestration
2016-07-16 13:47:09 +02:00
99ad2c486e
types/swarm: move default log driver under orchestration
...
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2016-07-15 23:06:41 -07:00
781ce7d855
Add `--force` in `docker volume rm` to fix out-of-band volume driver deletion
...
This fix tries to address the issue raised in
https://github.com/docker/docker/issues/23367
where an out-of-band volume driver deletion leaves some data in docker.
This prevent the reuse of deleted volume names (by out-of-band volume driver
like flocker).
This fix adds a `--force` field in `docker volume rm` to forcefully purge
the data of the volume that has already been deleted.
This fix is related to pull request in docker:
https://github.com/docker/docker/pull/23436
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-07-15 15:58:38 -07:00
cf82c64276
Make default docker host the same as unix for darwin.
...
The reason for this is that docker already default for unix docker in darwin too.
Also now that we have Docker for Mac, we can talk to the daemon using a unix socket.
So it seems like it makes a lot more sense that unix docker is the default.
Signed-off-by: Jonathan Leibiusky <ionathan@gmail.com>
2016-07-15 18:00:39 -03:00
39c7d7ec19
Remove execution driver
...
We use containerd now and there is no execution driver anymore.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2016-07-11 14:42:38 +08:00
98348ad6f9
Merge pull request #307 from NanXiao/patch-1
...
Fix typo in cancellable.go.
2016-07-08 05:36:04 -07:00
0f63791695
Fix typo in cancellable.go.
...
Signed-off-by: NanXiao <nan@chinadtrace.org>
2016-07-08 18:59:36 +08:00
1d247454d4
Merge pull request #294 from resouer/fix-nits
...
Minor fix of nits
2016-07-06 22:48:06 -07:00
5cc6c1115a
Merge pull request #306 from vdemeester/on-failure-inconsistency
...
Use on-failure on swarm for consistency with containers
2016-07-06 13:08:27 -07:00
04b9f20bec
Use on-failure on swarm for consistency with containers
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-07-06 21:41:56 +02:00
45706e3045
Merge pull request #305 from stevvooe/service-log-drivers
...
types/swarm: add support for log drivers
2016-07-06 09:40:18 +02:00
6b57ada660
Merge pull request #304 from mlaventure/capitalize-runtime-in-json
...
Keep Runtime from HostConfig capitalized when stored in json format
2016-07-05 21:34:53 -07:00
d83a995ac7
types/swarm: add support for log drivers
...
Adds the requisite fields for configuring log drivers on services. Log
drivers are propagated at the task-level, allowing a default to be
configured per cluster. If none are set, the engine default is used.
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2016-07-05 18:06:29 -07:00
Vincent Demeester
allencloud
Brian Goff
Yong Tang
Hui-Zhi
Sebastiaan van Stijn
Stephen J Day
Diogo Monica
Victor Vieux
Aaron Lehmann
Kenfe-Mickael Laventure
Tibor Vass
Michael Crosby
Tibor Vass
Sebastiaan van Stijn
Victor Vieux
Anusha Ragunathan
Junshuai Zhang
Jonathan Leibiusky (@xetorthio)
Qiang Huang
Doug Davis
Nan Xiao