summaryrefslogtreecommitdiff
path: root/docker
Commit message (Collapse)AuthorAgeFilesLines
* Add options to IPAMConfigwalkerlee-masterJoffrey F2016-12-021-1/+8
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #1328 from docker/ssladapter_transport_moduleBen Firshman2016-12-024-7/+7
|\ | | | | Move ssladapter to transport module
| * Move ssladapter to transport modulessladapter_transport_moduleJoffrey F2016-12-014-7/+7
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Move config type creation from docker.utils functions to classes inconfig_typesJoffrey F2016-12-0112-701/+704
|/ | | | | | docker.types Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #1303 from aanand/helpful-containers-warningBen Firshman2016-12-011-0/+6
|\ | | | | 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-281-0/+6
| | | | | | | | | | | | | | | | 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-308-11/+133
|\ \ | | | | | | Rename Client -> DockerClient
| * | Rename Client -> DockerClientdocker_clientJoffrey F2016-11-288-11/+133
| | | | | | | | | | | | | | | | | | | | | 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-291-19/+32
|\ \ \ | | | | | | | | | | | | | | | | bodnarbm/do-not-traverse-ignored-directories-with-no-potential-exceptions Do not traverse excluded directories that are not prefixes of dockerignore exceptions.
| * | | 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-281-3/+3
|\ \ \ | | | | | | | | Allow custom pid mode
| * | | Re-enable pid_mode checks for API < 1.24stepanstipl-allow_custom_pid_modeJoffrey F2016-11-281-0/+2
| | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | | Allow custom PID mode for the containerStepan Stipl2016-11-281-3/+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 #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-281-1/+5
|\ \ \ | |_|/ |/| | | | | | | | 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-281-1/+5
| |/ | | | | | | | | | | Fixes the new, purposely broken test added in the previous commit. Signed-off-by: Jon Cotton <jc@finaltransfer.net>
* | Merge pull request #1305 from bfirsh/update-setup-pyJoffrey F2016-11-281-1/+1
|\ \ | | | | | | 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>
* | Remove support for host_config in Client.startJoffrey F2016-11-281-66/+15
|/ | | | | | | Any additional arguments passed to start will raise a DeprecatedMethod (DockerException) exception. Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #1186 from bfirsh/two-point-ohJoffrey F2016-11-2233-446/+4583
|\ | | | | A new user-focused API
| * Add helpful error for APIClient methods on ClientBen Firshman2016-11-221-0/+10
| | | | | | | | Signed-off-by: Ben Firshman <ben@firshman.co.uk>
| * Add new user-focused APIBen Firshman2016-11-2214-30/+2297
| | | | | | | | | | | | 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>
| * 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-223-49/+59
| | | | | | | | Signed-off-by: Ben Firshman <ben@firshman.co.uk>
| * Remove AutoVersionClientBen Firshman2016-11-222-11/+1
| | | | | | | | | | | | Just do Client(version='auto'). Signed-off-by: Ben Firshman <ben@firshman.co.uk>
| * Make docker.utils.ports a single fileBen Firshman2016-11-222-4/+0
| | | | | | | | Signed-off-by: Ben Firshman <ben@firshman.co.uk>
| * Make docker.ssladaptor a single fileBen Firshman2016-11-224-5/+2
| | | | | | | | Signed-off-by: Ben Firshman <ben@firshman.co.uk>
| * Make docker.auth a single fileBen Firshman2016-11-226-23/+7
| | | | | | | | 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>
* | Fix ContainerApiMixin.copy with dict container argbiniambekele2016-11-221-1/+1
|/ | | | Signed-off-by: biniambekele <biniambekele@users.noreply.github.com>
* Merge pull request #1236 from docker/host_config_isolationJoffrey F2016-11-171-1/+9
|\ | | | | Add support for isolation param in host config
| * Add support for isolation param in host confighost_config_isolationJoffrey F2016-09-291-1/+9
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Convert dicts to Healthcheck objects, string commands to CMD-SHELL listsAanand Prasad2016-11-162-1/+10
| | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | Add support for passing healthcheck to create_containerJamie Greeff2016-11-164-4/+60
| | | | | | | | Signed-off-by: Jamie Greeff <jamie@greeff.me>
* | 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>
* | Add labels and shmsize arguments to the image buildRyan Belgrave2016-11-081-1/+18
| | | | | | | | Signed-off-by: Ryan Belgrave <Ryan.Belgrave@target.com>
* | Merge pull request #1230 from LabattFoodService/updateNodeJoffrey F2016-11-071-0/+7
|\ \ | | | | | | enable setting of node labels #1225
| * | enable setting of node labels #1225Nathan Shirlberg2016-09-271-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Fix endpoint spec and networks params in update_service1212-fix_create_serviceJoffrey F2016-11-041-4/+13
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | WIPJoffrey F2016-11-045-5/+66
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | Fix NpipeSocket.settimeout to match expected behavior1284-settimeout-fixJoffrey F2016-11-021-3/+6
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | Implement retry logic when the npipe open procedure failsnpipe-socket-busy-retryJoffrey F2016-10-261-10/+24
| | | | | | | | | | | | | | | | | | with ERROR_PIPE_BUSY Signed-off-by: Joffrey F <joffrey@docker.com>
* | | Fix dockerignore exclusion logic on Windowswin32-test-fixesJoffrey F2016-10-141-2/+2
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | Merge pull request #1254 from docker/npipe-advancedJoffrey F2016-10-145-4/+45
|\ \ \ | | | | | | | | Several fixes to npipe support
| * | | Several fixes to npipe supportnpipe-advancedJoffrey F2016-10-125-3/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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>
| * | | Do not allow bufsize to be 0 in NpipeSocket.makefile()1251-strictly-positive-bufsizeJoffrey F2016-10-111-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
View Lorry Controller Status