Граф коммитов

9154 Коммитов

Автор SHA1 Сообщение Дата
Kenfe-Mickael Laventure 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
Sebastiaan van Stijn 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
Brian Goff 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
Vincent Demeester 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
Stephen J Day 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
Tibor Vass 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
Stephen J Day 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
Tibor Vass 62043eb79d Merge pull request #296 from tonistiigi/defaultruntime
Add DefaultRuntime back to info
2016-06-30 14:52:10 -07:00
Tibor Vass 43585e8234 Merge pull request #290 from tonistiigi/add-externalcas
Add ExternalCAs to swarm spec
2016-06-30 14:51:40 -07:00
Tonis Tiigi cedc49d790 Add DefaultRuntime back to info
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-06-30 13:52:16 -07:00
Tonis Tiigi 79913193c4 Add ExternalCAs to swarm spec
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-06-30 11:49:54 -07:00
Harry Zhang c8ba73cc47 Minor fix of nits
Signed-off-by: Harry Zhang <resouer@163.com>
2016-06-30 11:32:32 -04:00
Vincent Demeester 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
allencloud c91de7891e fix comments it's into its
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-06-30 21:36:06 +08:00
David Calavera 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
Vincent Demeester 25941ecf6e Merge pull request #286 from allencloud/fix-comments-in-swarm
fix comments in swarm
2016-06-28 07:58:21 +02:00
Sebastiaan van Stijn f3d77787f9 Merge pull request #289 from mlaventure/remove-unused-defaultruntime-var
Delete DefaultRuntimeName variable
2016-06-27 15:21:12 -07:00
Kenfe-Mickael Laventure 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
allencloud 6ccbc9b080 add ensureReaderClosed when return in PluginInstall
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-06-26 00:03:30 +08:00
allencloud 58206370c6 fix comments in swarm
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-06-25 23:15:11 +08:00
Vincent Demeester f90ecdb1e9 Merge pull request #285 from icecrime/node_not_found
Add nodeNotFound NotFound()
2016-06-17 09:31:37 +02:00
Arnaud Porterie (icecrime) 2b70337c77
Add nodeNotFound NotFound()
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
2016-06-16 17:00:32 -07:00
Vincent Demeester f3ed0875cb Merge pull request #284 from icecrime/not_found_errors
Support NodeInspectWithRaw, improve not found errors
2016-06-17 01:44:23 +02:00
Arnaud Porterie (icecrime) 537a03e932
Support NodeInspectWithRaw, improve not found errors
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
2016-06-16 16:39:49 -07:00
Victor Vieux 19b4fb48a8 Merge pull request #281 from nishanttotla/pass-headers-services
Passing headers for service create/update
2016-06-16 15:29:46 -07:00
Nishant Totla bea12b8c3a
Passing headers for service create/update
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-06-16 15:08:15 -07:00
Tibor Vass c57d0447ea Merge pull request #280 from vdemeester/update-plugin-install-signature
Update PluginInstall signature for consistency
2016-06-16 13:35:40 -07:00
Victor Vieux d4b1f372e3 Merge pull request #283 from icecrime/service_inspect
Modify `ServiceInspect` to return raw data
2016-06-16 09:52:10 -07:00
Vincent Demeester 349336715d
Update PluginInstall signature for consistency
This make PluginInstall a little bit more consistent with the rest of
the api code base:

- Make enable and acceptAllPermissions optional
- Adds PrivilegeFunc to make it ask for login if the daemon error is an
  HTTP Unauthorized (just like image pull/push).
- Add a AcceptPermissionsFunc and remove Reader/Writer from the
  signature. The idea is to not force interactive input/output and let
  the user of the API defines the behavior for accepting permissions.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-06-16 12:22:08 +02:00
Arnaud Porterie (icecrime) a0da8ddf4b
Modify `ServiceInspect` to return raw data
Modify `ServiceInspect` to `ServiceInspectWithRaw`, and have it returned
the raw bytes.

Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
2016-06-15 22:11:45 -07:00
David Calavera f50fbe5f9c Merge pull request #271 from yongtang/22471-daemon-shutdown-timeout
Add config parameter to change per-container stop timeout during daemon shutdown
2016-06-15 09:24:19 -07:00
David Calavera 534e42a119 Merge pull request #276 from vdemeester/add-some-plugin-test
Add some unit tests to Plugin* methods
2016-06-15 09:23:32 -07:00
David Calavera cf0f1d7b74 Merge pull request #278 from vieux/optional_secret
optional swarm secret
2016-06-15 09:23:08 -07:00
Vincent Demeester c1549dd086 Merge pull request #279 from vieux/storage_opts_omit
add omitempty to storageopts
2016-06-15 09:20:34 +02:00
Victor Vieux 66ac20d635 optional swarm secret
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-06-14 14:22:20 -07:00
Victor Vieux a54c250af7 add omitempty to storageopts
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-06-14 14:21:15 -07:00
Brian Goff de0bc7ec1a Merge pull request #275 from vdemeester/interface-split
Split CommonAPIClient interface into several smaller interfaces
2016-06-14 10:22:02 -04:00
Vincent Demeester 4194e78ccf
Add some unit tests to Plugin* methods
This also set the `experimental` build tag to `make test` in order to
build them too.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-06-14 16:12:52 +02:00
Vincent Demeester f3b5ad20d4 Merge pull request #274 from vdemeester/plugin-split
Split plugin.go into several files
2016-06-14 16:10:57 +02:00
Vincent Demeester 20d52fd675
Split CommonAPIClient interface into several smaller
This groups method definitions by "object" type (container, image, …)
into smaller interface and use composition to make CommonAPIClient and
APIClient the same as right now.

This also moves `Checkpoint*` methods to the *experimental* interface as
it will be enabled into experimental first.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-06-14 12:01:37 +02:00
Vincent Demeester bdf17766ce
Split plugin.go into several files
This is *just a nit*, but to be consistent with other "objects".

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-06-14 11:47:13 +02:00
Sebastiaan van Stijn 5fd66ece9e Merge pull request #273 from tiborvass/plugins
plugins: update APIClient interface
2016-06-14 09:38:47 +02:00
Tibor Vass 0543c48aad plugins: update APIClient interface
Signed-off-by: Tibor Vass <teabee89@gmail.com>
2016-06-14 00:24:37 -07:00
Alexander Morozov 8e7bf86d99 Merge pull request #272 from tiborvass/plugins
plugins: add new types and client methods
2016-06-13 21:48:44 -07:00
Tibor Vass 408763fde9 plugins: add new types and client methods
Signed-off-by: Tibor Vass <teabee89@gmail.com>
2016-06-13 21:31:24 -07:00
Yong Tang b9b962eaba Add config parameter to change per-container stop timeout during daemon shutdown
This fix tries to add config paramter to change per-contaienr stop timeout during
the daemon shutdown. As the part of the update, this fix also changes `docker restart`
and `docker stop` so that if `--time` is not specified, then the default stop timeout
(10s) will be used.

This fix is related to
https://github.com/docker/docker/pull/22566
https://github.com/docker/docker/issues/22471

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-06-13 19:08:23 -07:00
Arnaud Porterie 6b2f24f16a Merge pull request #265 from vieux/swarmkit
Add swarm management API endpoints
2016-06-13 23:11:34 +00:00
Madhu Venugopal bf992794fd Merge pull request #269 from aboch/ll
Add list of link-local IPs to EndpointIPAMConfig
2016-06-13 08:44:00 -07:00
Victor Vieux 2f9f0bff7a change node update and swarm update to specs
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-06-12 05:45:13 -07:00
Victor Vieux 690cb2d08c fix lowercase, remove eject and fix order type/consts
Signed-off-by: Victor Vieux <vieux@docker.com>
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-06-12 05:24:26 -07:00