Commit Graph

3090 Commits

Author SHA1 Message Date
Michael Hankin 61bc8bea7f Add support for order property when updating a service
Signed-off-by: Michael Hankin <mjhankin1@gmail.com>
2017-12-12 15:49:07 -06:00
Joffrey F d8f996f969
Merge pull request #1825 from docker/fix-context-building
Fix common issues with build context creation: inaccessible files and FIFOs
2017-12-11 14:50:21 -08:00
Joffrey F b4eb3b9ce8
Merge pull request #1831 from asottile/patch-1
container: fix docstring for containers()
2017-12-07 14:07:34 -08:00
Anthony Sottile 9d23278643 container: fix docstring for containers()
Signed-off-by: Anthony Sottile <asottile@umich.edu>
2017-12-07 13:53:25 -08:00
Michael Hankin 0134939c2c Change format in which hosts are being stored for Swarm services
Signed-off-by: Michael Hankin <mhank@users.noreply.github.com>
2017-12-05 21:19:37 -06:00
Michael Hankin 8d770b012d Change format of extra hosts
Signed-off-by: Michael Hankin <mjhankin1@gmail.com>
2017-12-03 14:54:28 -06:00
Joffrey F 5c5705045b Fix common issues with build context creation: inaccessible files and fifos
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-11-29 16:42:28 -08:00
Joffrey F 94e3d3dcb9
Merge pull request #1819 from alexvy86/alexvy86-patch-1
Add missing call to string format in log message
2017-11-21 14:06:14 -08:00
Viktor Adam 36ed843e2b Only allow greedy queries on the model
Signed-off-by: Viktor Adam <rycus86@gmail.com>
2017-11-21 21:59:11 +00:00
Alex Villarreal 6cce101f01
Add missing call to string format in log message
Signed-off-by: Alejandro Villarreal <alex@alexvy86.com>
2017-11-21 10:07:02 -06:00
Damien Nadé f3dbd017f8 Fix for #1815: make APIClient.stop honor container StopTimeout value
Signed-off-by: Damien Nadé <anvil.github@livna.org>
2017-11-21 10:30:43 +01:00
Joffrey F 58c02ca963
Merge pull request #1798 from docker/unlock_swarm_support
Unlock swarm support
2017-11-20 16:58:17 -08:00
Viktor Adam 2878900a71 Fixing integration tests
Signed-off-by: Viktor Adam <rycus86@gmail.com>
2017-11-19 21:03:07 +00:00
Viktor Adam 7829b728a4 Fetch network details with network lists greedily
Signed-off-by: Viktor Adam <rycus86@gmail.com>
2017-11-16 23:15:31 +00:00
Viktor Adam 828b865bd7 Fix resetting ContainerSpec properties to None
Signed-off-by: Viktor Adam <rycus86@gmail.com>
2017-11-15 18:30:05 +00:00
Viktor Adam c78e73bf7a Attempting to make service update tests less flaky
Signed-off-by: Viktor Adam <rycus86@gmail.com>
2017-11-15 08:17:16 +00:00
Viktor Adam b2d08e64bc Service model update changes
Signed-off-by: Viktor Adam <rycus86@gmail.com>
2017-11-14 23:32:19 +00:00
Viktor Adam 6e5eb2eba7 Update service using previous spec
Signed-off-by: Viktor Adam <rycus86@gmail.com>
2017-11-14 21:10:23 +00:00
Joffrey F 1d6b5b2032
Merge pull request #1805 from thaJeztah/fix-swarm-update-test
Remove test_update_swarm_name
2017-11-13 19:06:25 -08:00
Sebastiaan van Stijn e6cc3c1540
Remove test_update_swarm_name
Docker currently only supports the "default" cluster
in Swarm-mode, and an upcoming SwarmKit release
will produce an error if the name of the cluster
is updated, causing the test to fail.

Given that renaming the cluster is not supported,
this patch removes the test

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-11-14 02:47:49 +01:00
HuyNQ 436306f09d
Add exit code to exec_run
Signed-off-by: HuyNQ <huy@huynq.net>
2017-11-13 14:11:21 +07:00
Joffrey F c7f1b5f84f dev version
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-11-08 17:04:53 -08:00
Joffrey F d400795634
Merge pull request #1802 from docker/2.6.1-release
2.6.1 release
2017-11-08 16:50:52 -08:00
Joffrey F 2008f52660 2.6.1 release
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-11-08 16:43:56 -08:00
Joffrey F aafae3dd86 dev version
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-11-08 16:41:03 -08:00
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