65d900eccb
Merge pull request #1285 from docker/1284-settimeout-fix
...
Fix NpipeSocket.settimeout to match expected behavior
2016-11-02 16:35:25 -07:00
422bc2beb2
Fix NpipeSocket.settimeout to match expected behavior
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-11-02 16:28:23 -07:00
4119fa93bd
Merge pull request #1283 from aboch/ip
...
Changes for current docker-py to pass in docker master
2016-11-02 11:44:22 -07:00
54586053b1
Changes for service tests to pass in docker master
...
- update config structure has new members
- service name update is no longer supported
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-11-01 16:56:37 -07:00
8bf5be6455
Merge pull request #1274 from docker/npipe-socket-busy-retry
...
Implement retry logic when the npipe open procedure fails
2016-10-27 20:01:45 +01:00
163a1ce371
Implement retry logic when the npipe open procedure fails
...
with ERROR_PIPE_BUSY
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-10-26 18:04:25 -07:00
a3981f891d
Add docker network IPAM options parameter
...
Signed-off-by: Walker Lee <walkerlee.tw@gmail.com>
2016-10-27 00:17:05 +08:00
c7dabbfa37
Merge pull request #1258 from docker/win32-test-fixes
...
Win32 test fixes
2016-10-14 17:10:59 -07:00
9a10447b40
Merge pull request #1242 from YorikSar/master
...
Support requests versions from 2.11.1 onwards
2016-10-14 16:56:45 -07:00
9b35c74f0e
Fix dockerignore exclusion logic on Windows
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-10-14 16:02:28 -07:00
cec3fe7c31
Update tests to avoid failures on Windows platforms
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-10-14 16:02:28 -07:00
9fc06b197b
Merge pull request #1254 from docker/npipe-advanced
...
Several fixes to npipe support
2016-10-14 16:01:53 -07:00
14634fb50a
Merge pull request #1256 from docker/format_env_unicode_bug
...
Do not break when calling format_environment with unicode values
2016-10-13 12:39:47 -07:00
3566e7c2f3
Merge pull request #1255 from docker/base_url_trailing_slash
...
Remove trailing slashes in result of utils.parse_host
2016-10-13 12:39:22 -07:00
1ed2938030
Merge pull request #1257 from bfirsh/remove-dead-code
...
Remove dead code in import_image_from_data
2016-10-13 10:44:14 -07:00
6768477edf
Remove dead code in import_image_from_data
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-10-13 10:48:32 +02:00
059f61bf5a
Do not break when calling format_environment with unicode values
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-10-12 17:52:43 -07:00
05f1060824
Remove trailing slashes in result of utils.parse_host
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-10-12 16:06:43 -07:00
c76ec15d9b
Several fixes to npipe support
...
- Fix _get_raw_response_socket to always return the NpipeSocket object
- Override NpipeHTTPConnectionPool._get_conn to avoid crash in urllib3
- Fix NpipeSocket.recv_into for Python 2
- Do not call select() on NpipeSocket objects
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-10-12 13:23:27 -07:00
6f7392ea09
Do not allow bufsize to be 0 in NpipeSocket.makefile()
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-10-11 15:16:43 -07:00
008730c670
Merge pull request #1248 from docker/setup-py-fixes
...
Add missing long_description and maintainer fields to setup.py
2016-10-05 16:45:50 -07:00
f4cb91eb02
Add missing long_description and maintainer fields to setup.py
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-10-05 15:27:36 -07:00
9957af9d57
Merge pull request #1243 from mattjegan/master
...
Fix syntax in README required by RST
2016-10-05 11:27:34 -07:00
dc8cf2b8e7
Merge pull request #1226 from TomasTomecek/remove-ipaddress-dep
...
document ipaddress dependency
2016-10-05 11:26:54 -07:00
531fdc77e8
Merge branch 'api-docs-update'
2016-10-05 11:21:31 -07:00
b22e390e56
Merge branch 'TomasTomecek-improve-version-mismatcj'
2016-10-05 11:19:23 -07:00
f52203601b
Merge branch 'TomasTomecek-improve-version-mismatcj'
2016-10-05 11:15:29 -07:00
230d8c7efe
Removed non-existent FAQ page from mkdocs.yml
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-10-05 11:15:09 -07:00
790d7525f0
document how to recover from api version mismatch
...
Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
2016-10-05 09:33:32 +02:00
aa2bd80ebb
document requirement for ipaddress module
...
Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
2016-10-05 09:32:33 +02:00
b65de73afe
Update adapters to use pool_connections instead of num_pools
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-10-04 12:19:33 -07:00
8239032463
fix for got an unexpected keyword argument 'num_pools'
...
requests's HTTPAdapter API is pool_connections for number of connection of the pool
Signed-off-by: Pierre Tardy <tardyp@gmail.com>
2016-10-04 13:13:31 +02:00
daec55d4e1
Fix syntax in README required by RST
...
Before the readme is converted to rst it required an extra character to convert with no errors. Signed-off-by: Matthew Egan <matthewj.egan@hotmail.com>
2016-10-04 13:38:01 +11:00
89a1ffa77b
Merge pull request #1217 from bfirsh/reorganisation-base-tests
...
Move BaseTestCase to BaseIntegrationTest
2016-10-03 11:36:02 -07:00
b00e321b58
Support requests versions from 2.11.1 onwards
...
Bug #1155 has been fixed starting with requests 2.11.1 and excluding it
from dependencies causes failures when using latest versions of both
libs together in our project.
Signed-off-by: Yuriy Taraday <yorik.sar@gmail.com>
2016-10-03 18:46:28 +03:00
69e992ec48
Move requires_api_version to helpers
...
Because it's a helper, not a base thing. In preparation for
moving/deleting the unit test base classes.
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-10-03 11:58:08 +01:00
7339d77043
Move BaseTestCase to BaseIntegrationTest
...
Because two things called `BaseTestCase` is quite confusing.
I haven't bothered refactoring the other `BaseTestCase` because
that disappears anyway when we drop Python 2.6 support.
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-10-03 11:58:08 +01:00
8cb186b623
Add timeout to from_env
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-10-03 11:58:08 +01:00
49997d040b
Add support for isolation param in host config
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-09-29 16:34:36 -07:00
2b34e0b8e4
Merge pull request #1224 from mferon/addRestartPolicyUpdateSupport
...
Add support for restart policy update
2016-09-29 14:53:53 -07:00
ce52e091e1
Merge pull request #1232 from pacoxu/typo_paco
...
replace on_failure with on-failure
2016-09-29 11:36:42 -07:00
81945c0901
Merge pull request #1234 from aboch/ip
...
Adjust test_create_network_with_ipam_config
2016-09-29 11:25:12 -07:00
a864059b83
Adjust test_create_network_with_ipam_config
...
- to account for API change: IPAM class will now
also include a Data class, besides Config.
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-09-29 09:49:58 -07:00
65ad1545e8
replace on_failure with on-failure
...
Signed-off-by: 徐俊杰<roollingstone@gmail.com>
Signed-off-by: XuPaco <roollingstone@gmail.com>
2016-09-29 11:01:51 +08:00
a665c8c443
Add support for restart policy update
...
Signed-off-by: Maxime Feron <maxime.feron@corp.ovh.com>
2016-09-28 10:21:59 +02:00
52c2cc8453
Merge pull request #1228 from christianbundy/synthesize-execute-bit
...
Synthesize execute permission bit
2016-09-27 15:47:22 -07:00
a718ab690e
Pass file object to Tarfile.addfile()
...
This resolves an issue where TarFile.gettarinfo() doesn't include the
file object, meaning that TarFile.addfile(TarFile.gettarinfo()) doesn't
pass the test suite. Instead, this uses an open() within a try...except
block to include a file object for each file without passing a file
object when the path is a directory.
Signed-off-by: Christian Bundy <christianbundy@fraction.io>
2016-09-27 21:39:30 +00:00
6ef14932d0
enable setting of node labels #1225
...
Added update_node function to enable setting labels on nodes. This
exposes the Update a Node function from the Docker API and should
enable promoting/demoting manager nodes inside a swarm.
Signed-off-by: Nathan Shirlberg <nshirlberg@labattfood.com>
2016-09-27 11:26:26 -05:00
cbd2ba52af
Synthesize executable bit on Windows
...
The build context is tarred up on the client and then sent to the Docker
daemon. However Windows permissions don't match the Unix ones.
Therefore we have to mark all files as executable when creating a build
context on Windows, like `docker build` already does:
https://github.com/docker/docker/issues/11047 .
Signed-off-by: Sebastian Schwarz <seschwar@gmail.com>
2016-09-27 00:11:31 +00:00
803ff5030e
Merge branch 'release'
2016-09-19 18:00:27 -07:00
Joffrey F
Joffrey F
Alessandro Boch
Aanand Prasad
Walker Lee
Ben Firshman
Tomas Tomecek
Pierre Tardy
mattjegan
Yuriy Taraday
徐俊杰
Maxime Feron
Christian Bundy
Nathan Shirlberg
Sebastian Schwarz