summaryrefslogtreecommitdiff
path: root/docker
Commit message (Collapse)AuthorAgeFilesLines
* Remove trailing slashes in result of utils.parse_hostbase_url_trailing_slashJoffrey F2016-10-121-2/+2
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Update adapters to use pool_connections instead of num_poolsJoffrey F2016-10-043-6/+6
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* fix for got an unexpected keyword argument 'num_pools'Pierre Tardy2016-10-041-1/+1
| | | | | | requests's HTTPAdapter API is pool_connections for number of connection of the pool Signed-off-by: Pierre Tardy <tardyp@gmail.com>
* Add timeout to from_envBen Firshman2016-10-031-1/+3
| | | | Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* Merge pull request #1224 from mferon/addRestartPolicyUpdateSupportJoffrey F2016-09-291-1/+9
|\ | | | | Add support for restart policy update
| * Add support for restart policy updateMaxime Feron2016-09-281-1/+9
| | | | | | | | Signed-off-by: Maxime Feron <maxime.feron@corp.ovh.com>
* | replace on_failure with on-failure徐俊杰2016-09-291-1/+1
|/ | | | | Signed-off-by: 徐俊杰<roollingstone@gmail.com> Signed-off-by: XuPaco <roollingstone@gmail.com>
* Pass file object to Tarfile.addfile()Christian Bundy2016-09-271-1/+12
| | | | | | | | | | This resolves an issue where TarFile.gettarinfo() doesn't include the file object, meaning that TarFile.addfile(TarFile.gettarinfo()) doesn't pass the test suite. Instead, this uses an open() within a try...except block to include a file object for each file without passing a file object when the path is a directory. Signed-off-by: Christian Bundy <christianbundy@fraction.io>
* Synthesize executable bit on WindowsSebastian Schwarz2016-09-271-1/+5
| | | | | | | | | | | The build context is tarred up on the client and then sent to the Docker daemon. However Windows permissions don't match the Unix ones. Therefore we have to mark all files as executable when creating a build context on Windows, like `docker build` already does: https://github.com/docker/docker/issues/11047. Signed-off-by: Sebastian Schwarz <seschwar@gmail.com>
* Merge pull request #1210 from docker/identity-token-supportJoffrey F2016-09-161-1/+12
|\ | | | | Add support for identity tokens in config file
| * Add support for identity tokens in config file.identity-token-supportJoffrey F2016-09-151-1/+12
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #1215 from bfirsh/autopep8Joffrey F2016-09-149-8/+13
|\ \ | | | | | | Fix a few pep8 issues
| * | Fix a few pep8 issuesBen Firshman2016-09-149-8/+13
| | | | | | | | | | | | | | | | | | autopep8 --in-place --recursive --experimental -aaa --ignore E309 . Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* | | Merge pull request #1208 from docker/1207-configurable-num-poolsJoffrey F2016-09-144-15/+31
|\ \ \ | | |/ | |/| Number of pools in adapter is configurable
| * | Number of pools in adapter is configurable1207-configurable-num-poolsJoffrey F2016-09-124-15/+31
| | | | | | | | | | | | | | | | | | Default increased from 10 to 25 Signed-off-by: Joffrey F <joffrey@docker.com>
* | | Merge pull request #1213 from bfirsh/parse-json-errorsJoffrey F2016-09-141-1/+4
|\ \ \ | | | | | | | | Parse JSON API errors
| * | | Parse JSON API errorsBen Firshman2016-09-141-1/+4
| | |/ | |/| | | | | | | Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* | | Ignore not in swarm error when force leavingBen Firshman2016-09-141-1/+5
|/ / | | | | | | | | | | | | | | | | Real errors were getting swallowed in these tests, producing other confusing cascading errors. This makes it much easier to make sure a node is not in a Swarm, while also handling other errors correctly. Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* | Re-add docker.utils.types module for backwards compatibility1196-docker.utils.typesJoffrey F2016-09-091-0/+7
|/ | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* dev versionJoffrey F2016-09-091-1/+1
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Bump version1.10.0-releaseJoffrey F2016-09-081-1/+1
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Remove default adapters when connecting through a unix socket.1076-dns-fixJoffrey F2016-09-081-0/+5
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Handle bufsize < 0 in makefile() as a substitute for default1188-npipesocket-makefileJoffrey F2016-09-071-1/+1
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Add support for changes param in import_image* methodsJoffrey F2016-09-061-75/+97
| | | | | | Reduce code duplication in import_image* methods Signed-off-by: Joffrey F <joffrey@docker.com>
* Better credentials store error handling in resolve_authconfigcredstore-supportJoffrey F2016-09-061-5/+6
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Add credentials store supportJoffrey F2016-09-061-0/+37
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Fix licensesBen Firshman2016-09-056-82/+0
| | | | | | | * Complete main LICENSE * Remove unnecessary licenses from individual files Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* Fix Mount bind type sanity checkJoel Martin2016-09-021-1/+1
| | | | | | any() expects a single collection argument, not a list of arguments. Signed-off-by: Joel Martin <github@martintribe.org>
* Add support for force disconnect1105-network-apiJoffrey F2016-08-311-2/+9
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Add support for labels and enable_ipv6 in create_networkJoffrey F2016-08-311-1/+18
| | | | | | Tests + docs Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #1167 from docker/1075-from-env-versionJoffrey F2016-08-251-1/+2
|\ | | | | Support version parameter in `Client.from_env`
| * Support version parameter in `Client.from_env`1075-from-env-versionJoffrey F2016-08-251-1/+2
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #1168 from docker/aiden0z-masterJoffrey F2016-08-251-1/+8
|\ \ | | | | | | Support pids_limit in HostConfig
| * \ Merge branch 'master' of https://github.com/aiden0z/docker-py into ↵Joffrey F2016-08-231-1/+8
| |\ \ | | |/ | |/| | | | aiden0z-master
| | * fix #1094, support PidsLimit in host configAiden Luo2016-06-171-1/+8
| | | | | | | | | | | | Signed-off-by: Aiden Luo <aiden0xz@gmail.com>
* | | Fix creating containers with env vars with unicode charactersfermayo2016-08-251-1/+1
| | | | | | | | | | | | Signed-off-by: Fernando Mayo <fernando@docker.com>
* | | Merge pull request #1082 from masci/fix_stream_helperJoffrey F2016-08-231-1/+1
|\ \ \ | |/ / |/| | Invoke self._result passing `json=True` when `decode=True`
| * | invoke self._result with json=True if decode=TrueMassimiliano Pippi2016-06-071-1/+1
| | | | | | | | | | | | Signed-off-by: Massimiliano Pippi <massi@datadoghq.com>
* | | support MemoryReservation and KernelMemoryKay Yan2016-08-231-2/+16
| | | | | | | | | | | | Signed-off-by: Kay Yan <kay.yan@daocloud.io>
* | | Merge branch 'master' of https://github.com/srikalyan/docker-py into ↵Joffrey F2016-08-231-1/+9
|\ \ \ | | | | | | | | | | | | srikalyan-master
| * | | Added support for user namespace.Srikalyan Swayampakula2016-06-301-1/+9
| | | | | | | | | | | | | | | | Signed-off-by: Srikalyan Swayampakula <srikalyansswayam@gmail.com>
* | | | Merge branch 'jp-cpushares' of https://github.com/joshpurvis/docker-py into ↵Joffrey F2016-08-231-1/+26
|\ \ \ \ | | | | | | | | | | | | | | | joshpurvis-jp-cpushares
| * | | | Move cpu_shares and cpuset_cpu to HostConfig when API >= 1.18Josh Purvis2016-08-151-1/+25
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Josh Purvis <joshua.purvis@gmail.com>
| * | | | docker client consistency: don't quote ':/'Tomas Tomecek2016-08-101-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | E.g. docker client `/v1.21/images/localhost:5000/busybox/push?tag=` docker-py `/v1.21/images/localhost%3A5000%2Fbusybox/push` Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
* | | | | Merge pull request #1081 from tescalada/masterJoffrey F2016-08-231-2/+10
|\ \ \ \ \ | | | | | | | | | | | | 1059-Fixing a bug with multiple json objects
| * | | | | 1059-Fixing a bug with multiple json objectsTristan Escalada2016-08-011-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This splits the text by CRLF and then json.loads each part independently instead of attempting the parse the whole string. Signed-off-by: Tristan Escalada <tristan@escalada.us>
* | | | | | Merge pull request #1131 from Knetic/dnsoptsJoffrey F2016-08-231-1/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | Implemented dns_opt support (from api 1.21)
| * | | | | | Implemented dns_opt support (from api 1.21)George Lester2016-08-071-1/+7
| | |/ / / / | |/| | | | | | | | | | | | | | | | Signed-off-by: George Lester <glester491@gmail.com>
* | | | | | Private images support in create_service / update_service1085-service-supportJoffrey F2016-08-234-37/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor auth header computation Add tasks methods and documentation. Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | | | Rename LogDriver to DriverConfig for genericityJoffrey F2016-08-222-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The class can be used for both log driver and volume driver specs. Use a name that reflects this. Signed-off-by: Joffrey F <joffrey@docker.com>
View Lorry Controller Status