summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Move ssladapter to transport modulessladapter_transport_moduleJoffrey F2016-12-015-8/+8
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Client -> DockerClientJoffrey F2016-12-011-1/+1
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #1303 from aanand/helpful-containers-warningBen Firshman2016-12-012-0/+17
|\ | | | | Show a helpful warning when people try to call `client.containers()`
| * Show a helpful warning when people try to call `client.containers()`Aanand Prasad2016-11-282-0/+17
| | | | | | | | | | | | | | | | People upgrading to docker-py 2.0 without being aware of the new client API will likely try to call the old `containers()` method. This adds a helpful warning telling them to use APIClient to get the old API. Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | Merge pull request #1308 from docker/docker_clientJoffrey F2016-11-3014-287/+206
|\ \ | | | | | | Rename Client -> DockerClient
| * | 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 #1277 from ↵Ben Firshman2016-11-292-20/+107
|\ \ \ | | | | | | | | | | | | | | | | bodnarbm/do-not-traverse-ignored-directories-with-no-potential-exceptions Do not traverse excluded directories that are not prefixes of dockerignore exceptions.
| * | | Add unit tests for should_check_directory.Brandon Bodnar2016-11-261-1/+75
| | | | | | | | | | | | | | | | Signed-off-by: Brandon Bodnar <bodnarbm@gmail.com>
| * | | Prevent traversing excluded directories with no possible dockerignore exceptionsBrandon Bodnar2016-11-261-19/+32
| |/ / | | | | | | | | | | | | | | | Fixes an issue where all files in a rather large excluded folder are traversed and examined when creating the build context for potential exception to the exclusion, even though the exclusion rule is for a completely unrelated folder. Signed-off-by: Brandon Bodnar <bodnarbm@gmail.com>
* | | Merge pull request #1250 from mmerickel/fix/1211Joffrey F2016-11-281-3/+7
|\ \ \ | | | | | | | | do not assume that read will consume the number of bytes requested
| * | | do not assume that read will consume the number of bytes requestedMichael Merickel2016-11-281-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The issue is that ``os.read`` does not always read the expected number of bytes, and thus we are moving to the next frame too early causing drift in the byte stream. When the reading drifts, it starts reading garbage as the next frame size. The some examples of frame sizes were 4032897957 bytes, etc. Values this large were causing the exceptions from ``os.read``. fixes #1211 Signed-off-by: Michael Merickel <michael@merickel.org>
* | | | Merge pull request #1297 from docker/stepanstipl-allow_custom_pid_modeJoffrey F2016-11-283-10/+16
|\ \ \ \ | | | | | | | | | | Allow custom pid mode
| * | | | Re-enable pid_mode checks for API < 1.24stepanstipl-allow_custom_pid_modeJoffrey F2016-11-283-4/+15
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | | | Allow custom PID mode for the containerStepan Stipl2016-11-282-6/+1
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Docker added support for sharing PID namespaces with other containers since version 1.12 (see https://github.com/docker/docker/pull/22481). Signed-off-by: Stepan Stipl <stepan@stipl.net>
* | | | Merge pull request #1309 from bfirsh/remove-maintainer-from-dockerfilesJoffrey F2016-11-284-11/+0
|\ \ \ \ | | | | | | | | | | Remove MAINTAINER from Dockerfiles
| * | | | Remove MAINTAINER from DockerfilesBen Firshman2016-11-244-11/+0
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | It was deprecated in https://github.com/docker/docker/pull/25466 (Sorry @shin- ;) Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* | | | Merge pull request #1316 from bfirsh/add-example-for-tagJoffrey F2016-11-281-0/+5
|\ \ \ \ | | | | | | | | | | Add example for tag()
| * | | | Add example for tag()Ben Firshman2016-11-281-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Carrying #1120. Thanks @Faylixe! Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* | | | | Merge pull request #1317 from ↵Joffrey F2016-11-282-2/+14
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | bfirsh/fix-environment-variable-file-with-new-lines Fix parsing for an environment file with newlines
| * | | | Fix parsing for an environment file with newlinesJon Cotton2016-11-282-2/+14
| |/ / / | | | | | | | | | | | | | | | | | | | | Fixes the new, purposely broken test added in the previous commit. Signed-off-by: Jon Cotton <jc@finaltransfer.net>
* | | | Merge pull request #1314 from bfirsh/specify-encoding-for-readmeJoffrey F2016-11-281-1/+2
|\ \ \ \ | |_|_|/ |/| | | Specify encoding when loading readme
| * | | Specify encoding when loading readmeBen Firshman2016-11-281-1/+2
| | |/ | |/| | | | | | | | | | | | | | | | | | | Loading readme fails when system locale is not utf-8. Potentially replaces #1313 Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* | | Merge pull request #1305 from bfirsh/update-setup-pyJoffrey F2016-11-283-11/+8
|\ \ \ | | | | | | | | Update setup.py and things
| * | | Bump version to 2.0.0-devBen Firshman2016-11-281-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Ben Firshman <ben@firshman.co.uk>
| * | | Use find_packages in setup.pyBen Firshman2016-11-281-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | It was missing docker.models, and this will fix it forever more. Signed-off-by: Ben Firshman <ben@firshman.co.uk>
| * | | Update setup.py detailsBen Firshman2016-11-281-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Move from "docker-py" package to "docker". Signed-off-by: Ben Firshman <ben@firshman.co.uk>
| * | | Update readme to say "Docker Engine API"Ben Firshman2016-11-281-1/+1
| | |/ | |/| | | | | | | | | | | | | It's not the Docker API. Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* | | Merge pull request #822 from docker/no_start_configBen Firshman2016-11-282-101/+26
|\ \ \ | |/ / |/| | Remove support for host_config in Client.start
| * | Remove support for host_config in Client.startJoffrey F2016-11-282-101/+26
|/ / | | | | | | | | | | | | Any additional arguments passed to start will raise a DeprecatedMethod (DockerException) exception. Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #1307 from docker/bfirsh_maintainerAanand Prasad2016-11-281-0/+6
|\ \ | |/ |/| Add Ben to MAINTAINERS
| * Add Ben to MAINTAINERSbfirsh_maintainerJoffrey F2016-11-231-0/+6
|/ | | | 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>
View Lorry Controller Status