Commit Graph

1822 Commits

Author SHA1 Message Date
Ben Firshman c7a3aa7e44
Add new Sphinx documentation
Initial work thanks to @aanand.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-22 17:05:43 +00:00
Ben Firshman 1984f68730
Add new user-focused API
See #1086

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-22 17:05:43 +00:00
Ben Firshman f32c0c1709
Add docstrings to low-level API
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-22 17:03:04 +00:00
Ben Firshman ed959f2144
Move contributing docs to CONTRIBUTING.md
CONTRIBUTING.md is the place that GitHub expects it to be.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-22 17:03:04 +00:00
Ben Firshman d98a879016
Add random_name test helper
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-22 17:03:04 +00:00
Ben Firshman 6334312e47
Split out base integration test for APIClient
So the cleanup stuff can be reused for model tests.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-22 17:03:04 +00:00
Ben Firshman 39900c558c
Move APIClient tests into single file
For some reason this was spread across two files.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-22 17:03:04 +00:00
Ben Firshman e055a1c813
Rename DockerClientTest to BaseAPIClientTest
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-22 17:03:04 +00:00
Ben Firshman dac7174ff2
Make ping return bool instead of string
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-22 17:03:03 +00:00
Ben Firshman 9daa320454
Rename Client to APIClient
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-22 17:03:03 +00:00
Ben Firshman c7903f084e
Remove AutoVersionClient
Just do Client(version='auto').

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-22 17:03:03 +00:00
Ben Firshman 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
Ben Firshman 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
Ben Firshman 19eefcf705
Make docker.ssladaptor a single file
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-22 17:03:03 +00:00
Ben Firshman 2c9d1110f0
Make docker.auth a single file
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-22 17:03:03 +00:00
Ben Firshman 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
Joffrey F 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
Ben Firshman 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
Joffrey F 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
Aanand Prasad 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
Aanand Prasad 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
Aanand Prasad 6bb7844ab3 Rework healthcheck integration test
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-11-16 16:04:17 +00:00
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
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
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