summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Rename Client -> DockerClientdocker_clientJoffrey F2016-11-2814-287/+206
| | | | | | | Replace references to old Client with APIClient Moved contents of services.md to appropriate locations Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #1306 from bfirsh/mmmmmm-vector-graphicsJoffrey F2016-11-231-1/+1
|\ | | | | Use SVG for build status badge
| * Use SVG for build status badgeBen Firshman2016-11-231-1/+1
| | | | | | | | Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* | Merge pull request #1304 from bfirsh/fix-documentation-linkJoffrey F2016-11-231-2/+4
|\ \ | |/ |/| Fix documentation link in readme
| * Add warning about development version to readmeBen Firshman2016-11-231-0/+2
| | | | | | | | Signed-off-by: Ben Firshman <ben@firshman.co.uk>
| * Change package in readme back to docker-pyBen Firshman2016-11-231-1/+1
| | | | | | | | Signed-off-by: Ben Firshman <ben@firshman.co.uk>
| * Fix documentation link in readmeBen Firshman2016-11-231-1/+1
|/ | | | | | | | | The rest of the readme is wrong until we release 2.0, but at least the documentation points to the right place. Closes #1302 Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* Merge pull request #1186 from bfirsh/two-point-ohJoffrey F2016-11-22116-2927/+7369
|\ | | | | A new user-focused API
| * Add helpful error for APIClient methods on ClientBen Firshman2016-11-222-0/+24
| | | | | | | | Signed-off-by: Ben Firshman <ben@firshman.co.uk>
| * Add new Sphinx documentationBen Firshman2016-11-2231-2137/+892
| | | | | | | | | | | | Initial work thanks to @aanand. Signed-off-by: Ben Firshman <ben@firshman.co.uk>
| * Add new user-focused APIBen Firshman2016-11-2236-77/+3942
| | | | | | | | | | | | See #1086 Signed-off-by: Ben Firshman <ben@firshman.co.uk>
| * Add docstrings to low-level APIBen Firshman2016-11-2212-2/+1876
| | | | | | | | Signed-off-by: Ben Firshman <ben@firshman.co.uk>
| * Move contributing docs to CONTRIBUTING.mdBen Firshman2016-11-222-36/+34
| | | | | | | | | | | | CONTRIBUTING.md is the place that GitHub expects it to be. Signed-off-by: Ben Firshman <ben@firshman.co.uk>
| * Add random_name test helperBen Firshman2016-11-222-7/+8
| | | | | | | | Signed-off-by: Ben Firshman <ben@firshman.co.uk>
| * Split out base integration test for APIClientBen Firshman2016-11-2212-64/+67
| | | | | | | | | | | | So the cleanup stuff can be reused for model tests. Signed-off-by: Ben Firshman <ben@firshman.co.uk>
| * Move APIClient tests into single fileBen Firshman2016-11-222-79/+71
| | | | | | | | | | | | For some reason this was spread across two files. Signed-off-by: Ben Firshman <ben@firshman.co.uk>
| * Rename DockerClientTest to BaseAPIClientTestBen Firshman2016-11-228-18/+18
| | | | | | | | Signed-off-by: Ben Firshman <ben@firshman.co.uk>
| * Make ping return bool instead of stringBen Firshman2016-11-221-1/+1
| | | | | | | | Signed-off-by: Ben Firshman <ben@firshman.co.uk>
| * Rename Client to APIClientBen Firshman2016-11-2224-100/+114
| | | | | | | | Signed-off-by: Ben Firshman <ben@firshman.co.uk>
| * Remove AutoVersionClientBen Firshman2016-11-223-22/+1
| | | | | | | | | | | | Just do Client(version='auto'). Signed-off-by: Ben Firshman <ben@firshman.co.uk>
| * Drop support for Python 2.6Ben Firshman2016-11-2210-82/+36
| | | | | | | | | | | | | | 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>
| * Make docker.utils.ports a single fileBen Firshman2016-11-223-5/+1
| | | | | | | | Signed-off-by: Ben Firshman <ben@firshman.co.uk>
| * Make docker.ssladaptor a single fileBen Firshman2016-11-226-7/+4
| | | | | | | | Signed-off-by: Ben Firshman <ben@firshman.co.uk>
| * Make docker.auth a single fileBen Firshman2016-11-229-33/+14
| | | | | | | | Signed-off-by: Ben Firshman <ben@firshman.co.uk>
| * Drop support for API versions <1.24Ben Firshman2016-11-222-0/+9
| | | | | | | | | | | | | | Implemented as just a warning. Actual removal of code will follow sometime in the future. Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* | Merge pull request #1301 from biniambekele/masterJoffrey F2016-11-221-1/+1
|\ \ | |/ |/| Fix ContainerApiMixin.copy with dict container arg
| * Fix ContainerApiMixin.copy with dict container argbiniambekele2016-11-221-1/+1
|/ | | | Signed-off-by: biniambekele <biniambekele@users.noreply.github.com>
* Merge pull request #1266 from bfirsh/add-rm-to-makefile-docker-runJoffrey F2016-11-211-9/+9
|\ | | | | Add --rm to docker run in Makefile
| * Add --rm to docker run in MakefileBen Firshman2016-11-211-9/+9
|/ | | | | | | | 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>
* Merge pull request #1236 from docker/host_config_isolationJoffrey F2016-11-174-2/+33
|\ | | | | Add support for isolation param in host config
| * Add support for isolation param in host confighost_config_isolationJoffrey F2016-09-294-2/+33
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #1294 from aanand/add-healthcheckAanand Prasad2016-11-166-5/+130
|\ \ | | | | | | Add support for passing healthcheck to create_container
| * | Convert dicts to Healthcheck objects, string commands to CMD-SHELL listsAanand Prasad2016-11-163-35/+39
| | | | | | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
| * | Rework healthcheck integration testAanand Prasad2016-11-162-27/+57
| | | | | | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
| * | Add support for passing healthcheck to create_containerJamie Greeff2016-11-165-4/+95
|/ / | | | | | | Signed-off-by: Jamie Greeff <jamie@greeff.me>
* | Merge pull request #1281 from ↵Joffrey F2016-11-141-1/+2
|\ \ | | | | | | | | | | | | TomasTomecek/1265-ssl-test-no-sslX-support-in-openssl ssl,test: OpenSSL may not support ssl2
| * | ssl,test: OpenSSL may not support ssl2Tomas Tomecek2016-11-141-1/+2
| | | | | | | | | | | | | | | | | | Fixes #1265 Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
* | | Merge pull request #1296 from aanand/fix-flake8Joffrey F2016-11-141-0/+1
|\ \ \ | |/ / |/| | Fix linting error
| * | Fix linting errorAanand Prasad2016-11-141-0/+1
|/ / | | | | | | | | | | | | 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>
* | Merge pull request #1292 from liubin/masterJoffrey F2016-11-111-1/+1
|\ \ | | | | | | Fix DriverConfig JSON key
| * | fix JSON key typo, it should not be underscores, but should be camelCase ↵bin liu2016-11-111-1/+1
|/ / | | | | | | | | | | with first letter capital Signed-off-by: bin liu <liubin0329@gmail.com>
* | Merge pull request #1263 from rmb938/labelshmJoffrey F2016-11-093-1/+59
|\ \ | | | | | | Add labels and shmsize arguments to the image build
| * | Add labels and shmsize arguments to the image buildRyan Belgrave2016-11-083-1/+59
|/ / | | | | | | Signed-off-by: Ryan Belgrave <Ryan.Belgrave@target.com>
* | Merge pull request #1290 from bfirsh/fix-broken-unit-testJoffrey F2016-11-071-1/+1
|\ \ | | | | | | Fix broken unit test
| * | Fix broken unit testBen Firshman2016-11-071-1/+1
|/ / | | | | | | | | | | Introduced by https://github.com/docker/docker-py/pull/1230 Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* | Merge pull request #1230 from LabattFoodService/updateNodeJoffrey F2016-11-076-0/+101
|\ \ | | | | | | enable setting of node labels #1225
| * | enable setting of node labels #1225Nathan Shirlberg2016-09-276-0/+101
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge pull request #1239 from docker/1212-fix_create_serviceJoffrey F2016-11-047-11/+157
|\ \ \ | | | | | | | | Fix several create_service arguments
| * | | Fix endpoint spec and networks params in update_service1212-fix_create_serviceJoffrey F2016-11-042-5/+14
| | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | | WIPJoffrey F2016-11-047-6/+143
|/ / / | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
View Lorry Controller Status