summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Better credentials store error handling in resolve_authconfigcredstore-supportJoffrey F2016-09-063-7/+8
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Add credentials store supportJoffrey F2016-09-063-1/+40
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #1184 from bfirsh/fix-licensesJoffrey F2016-09-069-122/+1
|\ | | | | Fix licenses
| * Fix licensesBen Firshman2016-09-059-122/+1
| | | | | | | | | | | | | | * Complete main LICENSE * Remove unnecessary licenses from individual files Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* | Merge pull request #1185 from bfirsh/make-docsJoffrey F2016-09-063-1/+16
|\ \ | |/ |/| Add make docs command for building docs
| * Add make docs command for building docsBen Firshman2016-09-053-1/+16
|/ | | | Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* Merge pull request #1180 from kanaka/patch-1Joffrey F2016-09-021-1/+1
|\ | | | | Fix Mount bind type sanity check
| * 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>
* Merge pull request #1178 from docker/1105-network-apiJoffrey F2016-09-014-12/+94
|\ | | | | Network labels, EnableIPv6 flag, force disconnect
| * Add support for force disconnect1105-network-apiJoffrey F2016-08-314-4/+41
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * Add support for labels and enable_ipv6 in create_networkJoffrey F2016-08-313-8/+53
|/ | | | | | Tests + docs Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #1167 from docker/1075-from-env-versionJoffrey F2016-08-252-1/+10
|\ | | | | Support version parameter in `Client.from_env`
| * Support version parameter in `Client.from_env`1075-from-env-versionJoffrey F2016-08-252-1/+10
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #1168 from docker/aiden0z-masterJoffrey F2016-08-253-4/+22
|\ \ | | | | | | Support pids_limit in HostConfig
| * | Docs and tests for pids_limit.aiden0z-masterJoffrey F2016-08-232-3/+14
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | 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>
* | | Merge pull request #1172 from fermayo/fix-utf8-envvarsJoffrey F2016-08-252-1/+21
|\ \ \ | | | | | | | | Fix creating containers with env vars with unicode characters
| * | | Fix creating containers with env vars with unicode charactersfermayo2016-08-252-1/+21
|/ / / | | | | | | | | | Signed-off-by: Fernando Mayo <fernando@docker.com>
* | | Merge pull request #1082 from masci/fix_stream_helperJoffrey F2016-08-232-2/+42
|\ \ \ | |/ / |/| | Invoke self._result passing `json=True` when `decode=True`
| * | invoke self._result with json=True if decode=TrueMassimiliano Pippi2016-06-072-2/+42
| | | | | | | | | | | | Signed-off-by: Massimiliano Pippi <massi@datadoghq.com>
* | | Merge branch 'DaoCloud-feature/memory_support'Joffrey F2016-08-232-2/+30
|\ \ \
| * | | support MemoryReservation and KernelMemoryKay Yan2016-08-232-2/+30
|/ / / | | | | | | | | | Signed-off-by: Kay Yan <kay.yan@daocloud.io>
* | | Merge branch 'srikalyan-master'Joffrey F2016-08-233-3/+22
|\ \ \
| * \ \ Merge branch 'master' of https://github.com/srikalyan/docker-py into ↵Joffrey F2016-08-233-3/+22
| |\ \ \ |/ / / / | | | | | | | | srikalyan-master
| * | | Added support for user namespace.Srikalyan Swayampakula2016-06-303-2/+21
| | | | | | | | | | | | | | | | Signed-off-by: Srikalyan Swayampakula <srikalyansswayam@gmail.com>
* | | | Merge branch 'joshpurvis-jp-cpushares'Joffrey F2016-08-235-4/+111
|\ \ \ \
| * \ \ \ Merge branch 'jp-cpushares' of https://github.com/joshpurvis/docker-py into ↵Joffrey F2016-08-235-4/+111
| |\ \ \ \ |/ / / / / | | | | | | | | | | joshpurvis-jp-cpushares
| * | | | Move cpu_shares and cpuset_cpu to HostConfig when API >= 1.18Josh Purvis2016-08-155-4/+110
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Josh Purvis <joshua.purvis@gmail.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-233-1/+21
|\ \ \ \ \ \ | | | | | | | | | | | | | | Implemented dns_opt support (from api 1.21)
| * | | | | | Implemented dns_opt support (from api 1.21)George Lester2016-08-073-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: George Lester <glester491@gmail.com>
* | | | | | | Merge pull request #1127 from docker/1085-service-supportJoffrey F2016-08-2322-49/+1380
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Service support implementation
| * | | | | | | Private images support in create_service / update_service1085-service-supportJoffrey F2016-08-236-38/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor auth header computation Add tasks methods and documentation. Signed-off-by: Joffrey F <joffrey@docker.com>
| * | | | | | | Add services documentationJoffrey F2016-08-222-2/+163
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | | | | | Add new pages to mkdocs indexJoffrey F2016-08-191-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | | | | | | Services API documentation (WIP)Joffrey F2016-08-192-0/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | | | | | | New docker.types subpackage containing advanced config dictionary typesJoffrey F2016-08-1912-242/+345
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tests and docs updated to match docker.utils.types has been moved to docker.types Signed-off-by: Joffrey F <joffrey@docker.com>
| * | | | | | | Service API integration testsJoffrey F2016-08-172-2/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | | | | | | Swarm service API implementationJoffrey F2016-08-174-4/+241
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | | | | | | Remove references to "ExecutionDriver"Brian Goff2016-08-173-39/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docker no longer has an `ExecutionDriver` as of Docker 1.11. The field in the `docker info` API will not be present in 1.13. Found this while working on docker/docker#25721 Signed-off-by: Brian Goff <cpuguy83@gmail.com>
| * | | | | | | docker client consistency: don't quote ':/'Tomas Tomecek2016-08-172-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | | | | | Exclude requests 2.11 from setup.py to work around unicode bugJoffrey F2016-08-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | | | | | | Add `nodes` and `inspect_node` methodsswarm-supportJoffrey F2016-08-114-1/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | | | | | | Reference swarm methods in api.md file.Joffrey F2016-08-041-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | | | | | | Add support for custom name in SwarmSpecJoffrey F2016-08-043-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | | | | | | Update Swarm API docsJoffrey F2016-08-041-9/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | | | | | | Update arguments for several Swarm API methodsJoffrey F2016-08-044-20/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Client.update_swarm method Add test for Client.update_swarm Signed-off-by: Joffrey F <joffrey@docker.com>
View Lorry Controller Status