d5bc7dc99a
Drop support for Python 2.6
...
Because it's ancient. If you're still using it, you can use an old
version of docker-py.
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-22 17:03:03 +00:00
b49cacced0
Make docker.utils.ports a single file
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-22 17:03:03 +00:00
19eefcf705
Make docker.ssladaptor a single file
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-22 17:03:03 +00:00
2c9d1110f0
Make docker.auth a single file
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-22 17:03:03 +00:00
81dfc475b3
Drop support for API versions <1.24
...
Implemented as just a warning. Actual removal of code will follow
sometime in the future.
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-22 17:03:01 +00:00
7c7688cba9
Merge pull request #1266 from bfirsh/add-rm-to-makefile-docker-run
...
Add --rm to docker run in Makefile
2016-11-21 11:30:02 -08:00
087a049b06
Add --rm to docker run in Makefile
...
So tests don't leave containers all over the place. The downside
is this makes it a bit harder to debug a test's filesystem -
you'll have to remove the "--rm" and run the test again.
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-21 14:07:39 +00:00
f12b618ee9
Merge pull request #1236 from docker/host_config_isolation
...
Add support for isolation param in host config
2016-11-17 17:42:57 -08:00
2ff7371ae7
Merge pull request #1294 from aanand/add-healthcheck
...
Add support for passing healthcheck to create_container
2016-11-16 16:12:05 +00:00
e4b6d0dca6
Convert dicts to Healthcheck objects, string commands to CMD-SHELL lists
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-11-16 16:04:17 +00:00
6bb7844ab3
Rework healthcheck integration test
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-11-16 16:04:17 +00:00
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
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
558ec261e4
Merge pull request #1296 from aanand/fix-flake8
...
Fix linting error
2016-11-14 11:58:11 -08:00
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
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
2ca68f3d08
Merge pull request #1292 from liubin/master
...
Fix DriverConfig JSON key
2016-11-11 12:38:04 -08:00
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
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
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
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
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
bd10874bc9
Merge pull request #1290 from bfirsh/fix-broken-unit-test
...
Fix broken unit test
2016-11-07 13:52:10 -08:00
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
f745c8e7c5
Merge pull request #1230 from LabattFoodService/updateNode
...
enable setting of node labels #1225
2016-11-07 10:47:55 -08:00
ef76c8552c
Merge pull request #1239 from docker/1212-fix_create_service
...
Fix several create_service arguments
2016-11-04 17:55:10 -07:00
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
be2ae8df36
WIP
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-11-04 15:10:12 -07:00
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
Ben Firshman
Joffrey F
Aanand Prasad
Jamie Greeff
Tomas Tomecek
Simon Li
bin liu
Ryan Belgrave
Joffrey F
Alessandro Boch
Walker Lee