Commit Graph

2415 Commits

Author SHA1 Message Date
Joffrey F 21d2c65277 Merge branch 'release' of github.com:docker/docker-py
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-11-08 16:40:39 -08:00
Joffrey F 700fbef42b Fix broken unbuffered streaming with Py3
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-11-08 16:29:56 -08:00
Joffrey F 3bd053a4b7 Add unlock methods to Swarm model
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-11-07 15:44:54 -08:00
Joffrey F aa3c4f026d Add unlock_swarm and get_unlock_key to APIClient
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-11-07 15:19:07 -08:00
Joffrey F 65ba043d15 Update test engine versions in Jenkinsfile
Signed-off-by: Joffrey F <joffrey@docker.com>

Conflicts:
	Jenkinsfile
2017-11-07 15:18:26 -08:00
Joffrey F 3bad05136a Bump 2.6.0
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-11-07 15:18:26 -08:00
Joffrey F fe6c9a64b0 Style fixes. Copied docs to APIClient as well
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-11-07 15:18:26 -08:00
Martin Monperrus 3470968937 explain the socket parameter of exec_run
Signed-off-by: Martin Monperrus <martin.monperrus@gnieh.org>
2017-11-07 15:18:26 -08:00
Joffrey F af0071403c Add support for insert_defaults in inspect_service
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-11-07 15:18:26 -08:00
Joffrey F ecca6e0740 Update SwarmSpec to include new parameters
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-11-07 15:18:26 -08:00
Joffrey F a0f6758c76 Add support for scope filter in inspect_network
Fix missing scope implementation in create_network

Signed-off-by: Joffrey F <joffrey@docker.com>
2017-11-07 15:18:26 -08:00
Joffrey F 6e1f9333d3 Oops
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-11-07 15:18:26 -08:00
Joffrey F 9756a4ec4c Fix build tests to not rely on internet connectivity
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-11-07 15:18:26 -08:00
Joffrey F e055729104 Disable buffering based on presence of Connection Upgrade headers
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-11-07 15:18:26 -08:00
Chris Harris 047c67b31e Prevent data loss when attaching to container
The use of buffering within httplib.HTTPResponse can cause data
to be lost. socket.makefile() is called without a bufsize, which
causes a buffer to be used when recieving data. The attach
methods do a HTTP upgrade to tcp before the raw socket is using
to stream data from the container. The problem is that if the
container starts stream data while httplib/http.client is reading
the response to the attach request part of the data ends will end
up in the buffer of fileobject created within the HTTPResponse
object. This data is lost as after the attach request data is
read directly from the raw socket.

Signed-off-by: Chris Harris <chris.harris@kitware.com>
2017-11-07 15:18:26 -08:00
Joffrey F 114512a9bf Doc fixes
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-11-07 15:18:26 -08:00
Joffrey F a0853622f9 Add support for secret driver in create_secret
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-11-07 15:18:26 -08:00
Alessandro Baldo 80985cb5b2 Improve docs for service list filters
- add "label" and "mode" to the list of available filter keys in the high-level service API
- add "label" and "mode" to the list of available filter keys in the low-level service API
- add integration tests

Signed-off-by: Alessandro Baldo <git@baldoalessandro.net>
2017-11-07 15:18:26 -08:00
Joffrey F 2cb78062b1 More ContainerSpec tests
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-11-07 15:18:26 -08:00
Joffrey F b1301637cf Add support for configs management
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-11-07 15:18:26 -08:00
Joffrey F cd47a1f9f5 Add support for new ContainerSpec parameters
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-11-07 15:18:26 -08:00
Erik Johnson bb437e921e Fix indentation in docstring
The incorrect indentation causes improper formatting when the docs
are published.

Signed-off-by: Erik Johnson <palehose@gmail.com>
2017-11-07 15:18:26 -08:00
Joffrey F 53582a9cf5 Add support for extra_hosts option in build
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-11-07 15:18:26 -08:00
Joffrey F cdf9acb185 Pin flake8 version
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-11-07 15:18:26 -08:00
Joffrey F 5d1b652246 Add support for mounts in HostConfig
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-11-07 15:18:26 -08:00
Joffrey F eee9cbbf08 Add support for new types and options to docker.types.Mount
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-11-07 15:18:26 -08:00
Jan Losinski 8742609391 Fix simple documentation copy/paste error.
Signed-off-by: Jan Losinski <losinski@wh2.tu-dresden.de>
2017-11-07 15:18:26 -08:00
Joffrey F f94fae3aa8 Remove superfluous version validation
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-11-07 15:18:26 -08:00
Steve Clark 1d77ef9e53 Adding swarm id_attribute to match docker output
Swarm id is returned in a attribute with the key ID. The swarm model was using the default behaviour and looking for Id.
Signed-off-by: Steve Clark <steve@cobe.io>
2017-11-07 15:18:26 -08:00
brett55 ba66b09e2b Fix docs, incorrect param name
Signed-off-by: brett55 <bjcull2@gmail.com>
2017-11-07 15:18:26 -08:00
Joffrey F 7107e265b1 Do not interrupt streaming when encountering 0-length frames
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-11-07 15:18:26 -08:00
Joffrey F a49d73e9df Fix prune_images docstring
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-11-07 15:18:26 -08:00
Joffrey F 303b303855 Use unambiguous advertise-addr when initializing a swarm
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-11-07 15:18:26 -08:00
Joffrey F f470955a77 Shift test matrix forward
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-11-07 15:18:26 -08:00
Joffrey F f238fe5554 Style fixes. Copied docs to APIClient as well
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-11-06 17:10:42 -08:00
Martin Monperrus 05f40f0381 explain the socket parameter of exec_run
Signed-off-by: Martin Monperrus <martin.monperrus@gnieh.org>
2017-11-06 17:10:42 -08:00
Joffrey F 1a4b181344 Add support for insert_defaults in inspect_service
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-11-06 16:30:02 -08:00
Joffrey F 11a260225c Update SwarmSpec to include new parameters
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-11-03 16:01:33 -07:00
Joffrey F 1ce93ac6e7 Add support for scope filter in inspect_network
Fix missing scope implementation in create_network

Signed-off-by: Joffrey F <joffrey@docker.com>
2017-11-02 16:10:43 -07:00
Joffrey F ca7a6132a4 Oops
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-11-02 14:10:13 -07:00
Joffrey F d5094a8126 Fix build tests to not rely on internet connectivity
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-11-02 14:06:05 -07:00
Joffrey F 1359eb1100 Disable buffering based on presence of Connection Upgrade headers
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-11-02 13:02:32 -07:00
Chris Harris f8b5bc62df Prevent data loss when attaching to container
The use of buffering within httplib.HTTPResponse can cause data
to be lost. socket.makefile() is called without a bufsize, which
causes a buffer to be used when recieving data. The attach
methods do a HTTP upgrade to tcp before the raw socket is using
to stream data from the container. The problem is that if the
container starts stream data while httplib/http.client is reading
the response to the attach request part of the data ends will end
up in the buffer of fileobject created within the HTTPResponse
object. This data is lost as after the attach request data is
read directly from the raw socket.

Signed-off-by: Chris Harris <chris.harris@kitware.com>
2017-11-02 13:02:32 -07:00
timvisee ff86324c4f
Require at least requests v2.14.2 to fix chardet
Signed-off-by: timvisee <timvisee@gmail.com>
2017-11-02 14:30:18 +01:00
Joffrey F b99f4f2c69 Doc fixes
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-11-01 18:56:41 -07:00
Joffrey F c0a075810e Add support for secret driver in create_secret
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-11-01 18:56:41 -07:00
Alessandro Baldo 76b138a0a1 Improve docs for service list filters
- add "label" and "mode" to the list of available filter keys in the high-level service API
- add "label" and "mode" to the list of available filter keys in the low-level service API
- add integration tests

Signed-off-by: Alessandro Baldo <git@baldoalessandro.net>
2017-11-01 15:18:05 -07:00
Joffrey F bb148380e1 More ContainerSpec tests
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-10-26 23:06:09 -07:00
Joffrey F 856414bf85 Add support for configs management
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-10-26 23:06:09 -07:00
Joffrey F 601d6be526 Add support for new ContainerSpec parameters
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-10-26 23:06:09 -07:00