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
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
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
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
f360792ff5
Keep Runtime from HostConfig capitalized when stored in json format
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-07-05 15:30:30 -07:00
139c221fcb
Merge pull request #300 from cpuguy83/invert_mount_populate
...
Invert to since it is the expected default
2016-07-01 13:42:06 -07:00
2d2ff7c7d6
Invert to since it is the expected default
...
Signed-off-by: Brian Goff <bgoff@cpuguy83-mbp.local>
2016-07-01 15:08:37 -04:00
bac0f6860e
Merge pull request #297 from stevvooe/remove-header-arguments
...
client/services: remove header arguments from ServiceCreate, ServiceU…
2016-07-01 21:07:36 +02:00
105a3596cf
client/services: remove header arguments from ServiceCreate, ServiceUpdate
...
In general, the Docker API client should avoid exposing HTTP details in
client, as it elides type safety and makes discovery of inputs to a
method more challenging. These have been removed and replaced with an
options type.
We may want to consider arbitrary header transmission through context,
but that is a bigger change.
Proper build tags have been added to experimental features that were
failing during non-tagged build.
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2016-07-01 11:30:35 -07:00
a4740cdb2d
Merge pull request #298 from stevvooe/readonly-over-writable
...
types/swarm: make mounts read write by default
2016-06-30 19:46:23 -07:00
2fc980698e
types/swarm: make mounts read write by default
...
To ensure that the zero-value reflects the defaults for mounts, change
the `Writable` to `ReadOnly`. Adds a breaking api change to address a
point of confusion.
If this PR is not merged by the 1.12 release, this can never be merged,
so just close and move on.
Related to docker/docker#24053 .
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2016-06-30 19:10:57 -07:00
62043eb79d
Merge pull request #296 from tonistiigi/defaultruntime
...
Add DefaultRuntime back to info
2016-06-30 14:52:10 -07:00
43585e8234
Merge pull request #290 from tonistiigi/add-externalcas
...
Add ExternalCAs to swarm spec
2016-06-30 14:51:40 -07:00
cedc49d790
Add DefaultRuntime back to info
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-06-30 13:52:16 -07:00
79913193c4
Add ExternalCAs to swarm spec
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-06-30 11:49:54 -07:00
c8ba73cc47
Minor fix of nits
...
Signed-off-by: Harry Zhang <resouer@163.com>
2016-06-30 11:32:32 -04:00
9885f1dfcf
Merge pull request #291 from allencloud/fix-it's-into-its
...
fix comments it's into its
2016-06-30 17:12:53 +02:00
c91de7891e
fix comments it's into its
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-06-30 21:36:06 +08:00
2e14eff07a
Merge pull request #287 from allencloud/add-ensureReaderClosed-in-PluginInstall
...
add ensureReaderClosed when return in PluginInstall
2016-06-29 15:29:48 -07:00
25941ecf6e
Merge pull request #286 from allencloud/fix-comments-in-swarm
...
fix comments in swarm
2016-06-28 07:58:21 +02:00
f3d77787f9
Merge pull request #289 from mlaventure/remove-unused-defaultruntime-var
...
Delete DefaultRuntimeName variable
2016-06-27 15:21:12 -07:00
153211b23a
Delete DefaultRuntimeName variable
...
It is no longer used or needed (see docker/docker#23775 )
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-06-27 11:59:50 -07:00
6ccbc9b080
add ensureReaderClosed when return in PluginInstall
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-06-26 00:03:30 +08:00
58206370c6
fix comments in swarm
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-06-25 23:15:11 +08:00
f90ecdb1e9
Merge pull request #285 from icecrime/node_not_found
...
Add nodeNotFound NotFound()
2016-06-17 09:31:37 +02:00
2b70337c77
Add nodeNotFound NotFound()
...
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
2016-06-16 17:00:32 -07:00
f3ed0875cb
Merge pull request #284 from icecrime/not_found_errors
...
Support NodeInspectWithRaw, improve not found errors
2016-06-17 01:44:23 +02:00
Kenfe-Mickael Laventure
Michael Crosby
Aaron Lehmann
Sebastiaan van Stijn
Tibor Vass
Tibor Vass
Sebastiaan van Stijn
Anusha Ragunathan
Victor Vieux
Vincent Demeester
Junshuai Zhang
Stephen J Day
Doug Davis
Nan Xiao
Brian Goff
Tonis Tiigi
Harry Zhang
allencloud
David Calavera
Arnaud Porterie (icecrime)