Commit Graph

2511 Commits

Author SHA1 Message Date
Joffrey F ac68a36a89
Merge pull request #1727 from mbelang/join-swarn-default-listen-address
Add join_swarm default listen address
2017-12-18 17:16:41 -08:00
Joffrey F 5736436966
Merge pull request #1828 from pkit/fix_error_from_httpex
fixes create_api_error_from_http_exception()
2017-12-18 14:26:47 -08:00
Constantine Peresypkin b20f800db6 fixes create_api_error_from_http_exception()
`create_api_error_from_http_exception()` is never tested in the original code
and will fail miserably when fed with empty `HTTPError` object
see fixes in requests for this behaviour: https://github.com/requests/requests/pull/3179

Signed-off-by: Constantine Peresypkin <pconstantine@gmail.com>
2017-12-18 17:15:48 +02:00
Boik adbb3079dd make the error message clearer
Signed-off-by: Boik <qazbnm456@gmail.com>
2017-12-16 09:31:27 +08:00
Joffrey F bf699c7ef7
Merge pull request #1836 from docker/1813-run-autoremove
Retrieve container logs before container exits / is removed
2017-12-14 17:45:18 -08:00
Joffrey F 1fd59586d1
Merge pull request #1837 from feliperuhland/fix_default_api_version
Updated DEFAULT API VERSION in docstrings.
2017-12-14 16:54:33 -08:00
Joffrey F 6b8dfe4249 Retrieve container logs before container exits / is removed
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-12-14 16:53:44 -08:00
Felipe Ruhland b6d0dc1e5a Fixed DEFAULT API VERSION in docstrings.
Signed-off-by: Felipe Ruhland <felipe.ruhland@gmail.com>
2017-12-14 22:39:34 -02:00
Joffrey F 8cfd4cb39f
Merge pull request #1807 from rycus86/update_service_from_prev_spec
Update service from prev spec
2017-12-14 12:44:36 -08:00
Joffrey F 644a82542b
Merge pull request #1834 from mhank/1823-support-update-order
Add support for order property when updating a service
2017-12-14 12:40:20 -08:00
Michael Hankin 49d09583aa Correct default value of order parameter
Signed-off-by: Michael Hankin <mjhankin1@gmail.com>
2017-12-14 08:58:26 -06:00
Viktor Adam a66c89247a Renaming new argument
Signed-off-by: Viktor Adam <rycus86@gmail.com>
2017-12-14 09:55:36 +00:00
Joffrey F 20b5b58bb0
Merge pull request #1835 from docker/1758-url-quote-path
Fix URL-quoting for resource names containing spaces
2017-12-13 19:09:13 -08:00
Joffrey F 1df979a58f Merge branch 'tz70s-master'
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-12-13 19:07:24 -08:00
Joffrey F 445cb18723 Add integration test for CPU realtime options
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-12-13 19:06:29 -08:00
Joffrey F d7bc8ac2b8 Merge branch 'master' of https://github.com/tz70s/docker-py into tz70s-master
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-12-13 18:50:07 -08:00
Joffrey F 6c74292d3d
Merge pull request #1789 from timvisee/chardet-fix
Require at least requests v2.14.2 to update old chardet
2017-12-13 18:37:01 -08:00
Joffrey F 7db76737ca Fix URL-quoting for resource names containing spaces
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-12-13 18:32:59 -08:00
Joffrey F 6f77e458d2
Merge pull request #1816 from Anvil/honor-stoptimeout
Fix for #1815: make APIClient.stop honor container StopTimeout value
2017-12-13 16:45:35 -08:00
Joffrey F aad0c76002
Merge pull request #1812 from rycus86/greedy_network_list
Fetch network details with network lists greedily
2017-12-13 16:33:06 -08:00
Joffrey F a916bfdde2
Merge pull request #1830 from mhank/1822-reformat-hosts
Fix format in which hosts are being stored for Swarm services
2017-12-13 16:26:42 -08:00
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