docker
/
docker-py
mirror of https://github.com/docker/docker-py.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,503 Commits 23 Branches 129 Tags 9.1 MiB
Commit Graph

2503 Commits

Author SHA1 Message Date
Jamie Greeff b4f2b5fa70 Add support for passing healthcheck to create_container 
Signed-off-by: Jamie Greeff <jamie@greeff.me>
 2016-11-16 16:04:17 +00:00
Joffrey F f262dd6da9 Merge pull request #1281 from TomasTomecek/1265-ssl-test-no-sslX-support-in-openssl 
ssl,test: OpenSSL may not support ssl2
 2016-11-14 12:02:55 -08:00
Joffrey F 558ec261e4 Merge pull request #1296 from aanand/fix-flake8 
Fix linting error
 2016-11-14 11:58:11 -08:00
Aanand Prasad c66c2d6fa5 Fix linting error 
This seems to have been ignored by older versions of flake8, and fixed
in version 3.1.0 or 3.1.1.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-11-14 18:20:13 +00:00
Tomas Tomecek 9a485b30ee ssl,test: OpenSSL may not support ssl2 
Fixes #1265

Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
 2016-11-14 09:05:26 +01:00
Joffrey F 2ca68f3d08 Merge pull request #1292 from liubin/master 
Fix DriverConfig JSON key
 2016-11-11 12:38:04 -08:00
Simon Li cb967ef682 Add test for creating service with env 
Signed-off-by: Simon Li <orpheus+devel@gmail.com>
 2016-11-11 16:29:43 +00:00
Simon Li 6fad0855b5 Use format_environment to convert env in ContainerSpec 
Signed-off-by: Simon Li <orpheus+devel@gmail.com>
 2016-11-11 16:11:18 +00:00
bin liu d6ffe9aa0d fix JSON key typo, it should not be underscores, but should be camelCase with first letter capital 
Signed-off-by: bin liu <liubin0329@gmail.com>
 2016-11-11 20:19:43 +08:00
Joffrey F e1518bf2a7 Merge pull request #1263 from rmb938/labelshm 
Add labels and shmsize arguments to the image build
 2016-11-09 10:54:59 -08:00
Ryan Belgrave 98e2e1fcd6
Add labels and shmsize arguments to the image build 
Signed-off-by: Ryan Belgrave <Ryan.Belgrave@target.com>
 2016-11-08 09:45:32 -06:00
Joffrey F bd10874bc9 Merge pull request #1290 from bfirsh/fix-broken-unit-test 
Fix broken unit test
 2016-11-07 13:52:10 -08:00
Ben Firshman 3c7c231983
Fix broken unit test 
Introduced by https://github.com/docker/docker-py/pull/1230

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-11-07 12:20:20 -08:00
Joffrey F f745c8e7c5 Merge pull request #1230 from LabattFoodService/updateNode 
enable setting of node labels #1225
 2016-11-07 10:47:55 -08:00
Joffrey F ef76c8552c Merge pull request #1239 from docker/1212-fix_create_service 
Fix several create_service arguments
 2016-11-04 17:55:10 -07:00
Joffrey F 3ac73a285b Fix endpoint spec and networks params in update_service 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-11-04 15:10:12 -07:00
Joffrey F be2ae8df36 WIP 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-11-04 15:10:12 -07:00
Joffrey F 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
Joffrey F 422bc2beb2 Fix NpipeSocket.settimeout to match expected behavior 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-11-02 16:28:23 -07:00
Joffrey F 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
Alessandro Boch 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
Aanand Prasad 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
Joffrey F 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
Walker Lee a3981f891d
Add docker network IPAM options parameter 
Signed-off-by: Walker Lee <walkerlee.tw@gmail.com>
 2016-10-27 00:17:05 +08:00
Joffrey F c7dabbfa37 Merge pull request #1258 from docker/win32-test-fixes 
Win32 test fixes
 2016-10-14 17:10:59 -07:00
Joffrey F 9a10447b40 Merge pull request #1242 from YorikSar/master 
Support requests versions from 2.11.1 onwards
 2016-10-14 16:56:45 -07:00
Joffrey F 9b35c74f0e Fix dockerignore exclusion logic on Windows 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-10-14 16:02:28 -07:00
Joffrey F 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
Joffrey F 9fc06b197b Merge pull request #1254 from docker/npipe-advanced 
Several fixes to npipe support
 2016-10-14 16:01:53 -07:00
Joffrey F 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
Joffrey F 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
Joffrey F 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
Ben Firshman 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
Joffrey F 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
Joffrey F 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
Joffrey F 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
Joffrey F 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
Joffrey F 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
Joffrey F 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
Joffrey F 9957af9d57 Merge pull request #1243 from mattjegan/master 
Fix syntax in README required by RST
 2016-10-05 11:27:34 -07:00
Joffrey F dc8cf2b8e7 Merge pull request #1226 from TomasTomecek/remove-ipaddress-dep 
document ipaddress dependency
 2016-10-05 11:26:54 -07:00
Joffrey F 531fdc77e8 Merge branch 'api-docs-update' 2016-10-05 11:21:31 -07:00
Joffrey F b22e390e56 Merge branch 'TomasTomecek-improve-version-mismatcj' 2016-10-05 11:19:23 -07:00
Joffrey F f52203601b Merge branch 'TomasTomecek-improve-version-mismatcj' 2016-10-05 11:15:29 -07:00
Joffrey F 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
Tomas Tomecek 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
Tomas Tomecek aa2bd80ebb document requirement for ipaddress module 
Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
 2016-10-05 09:32:33 +02:00
Joffrey F 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
Pierre Tardy 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
mattjegan 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