| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Bump version1.10.0-release | Joffrey F | 2016-09-08 | 3 | -2/+47 |
| | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | Merge pull request #1087 from docker/1076-dns-fix | Joffrey F | 2016-09-08 | 1 | -0/+5 |
| |\ | | | | | Remove default adapters when connecting through a unix socket. | ||||
| | * | Remove default adapters when connecting through a unix socket.1076-dns-fix | Joffrey F | 2016-09-08 | 1 | -0/+5 |
| |/ | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | Merge pull request #1191 from bfirsh/fix-makefile-phony | Joffrey F | 2016-09-08 | 1 | -2/+15 |
| |\ | | | | | Add .PHONY for each makefile instruction | ||||
| | * | Add .PHONY for each makefile instruction | Ben Firshman | 2016-09-08 | 1 | -2/+15 |
| |/ | | | | | | | | | | Makes it much easier to keep this maintained properly. See also: http://clarkgrubb.com/makefile-style-guide#phony-targets Replaces #1164 Signed-off-by: Ben Firshman <ben@firshman.co.uk> | ||||
| * | Merge pull request #1189 from docker/1188-npipesocket-makefile | Joffrey F | 2016-09-07 | 1 | -1/+1 |
| |\ | | | | | Handle bufsize < 0 in makefile() as a substitute for default | ||||
| | * | Handle bufsize < 0 in makefile() as a substitute for default1188-npipesocket-makefile | Joffrey F | 2016-09-07 | 1 | -1/+1 |
| |/ | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | Merge pull request #1187 from bfirsh/fix-broken-mac-address-unit-test | Joffrey F | 2016-09-07 | 2 | -37/+10 |
| |\ | | | | | Fix unit test which doesn't do anything | ||||
| | * | Fix unit test which doesn't do anything | Ben Firshman | 2016-09-07 | 2 | -37/+10 |
| |/ | | | | | | | It also overrode the fake API inspect endpoint with a broken response. Signed-off-by: Ben Firshman <ben@firshman.co.uk> | ||||
| * | Merge pull request #1092 from docker/1064-import-changes | Joffrey F | 2016-09-06 | 3 | -78/+141 |
| |\ | | | | | Add support for changes in import_image* | ||||
| | * | Add test for import_image with changes param1064-import-changes | Joffrey F | 2016-09-06 | 2 | -3/+44 |
| | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| | * | Add support for changes param in import_image* methods | Joffrey F | 2016-09-06 | 1 | -75/+97 |
| |/ | | | | | | Reduce code duplication in import_image* methods Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | Merge pull request #1181 from docker/credstore-support | Joffrey F | 2016-09-06 | 3 | -1/+41 |
| |\ | | | | | Add credentials store support | ||||
| | * | Better credentials store error handling in resolve_authconfigcredstore-support | Joffrey F | 2016-09-06 | 3 | -7/+8 |
| | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| | * | Add credentials store support | Joffrey F | 2016-09-06 | 3 | -1/+40 |
| |/ | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | Merge pull request #1184 from bfirsh/fix-licenses | Joffrey F | 2016-09-06 | 9 | -122/+1 |
| |\ | | | | | Fix licenses | ||||
| | * | Fix licenses | Ben Firshman | 2016-09-05 | 9 | -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-docs | Joffrey F | 2016-09-06 | 3 | -1/+16 |
| |\ \ | |/ |/| | Add make docs command for building docs | ||||
| | * | Add make docs command for building docs | Ben Firshman | 2016-09-05 | 3 | -1/+16 |
| |/ | | | | Signed-off-by: Ben Firshman <ben@firshman.co.uk> | ||||
| * | Merge pull request #1180 from kanaka/patch-1 | Joffrey F | 2016-09-02 | 1 | -1/+1 |
| |\ | | | | | Fix Mount bind type sanity check | ||||
| | * | Fix Mount bind type sanity check | Joel Martin | 2016-09-02 | 1 | -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-api | Joffrey F | 2016-09-01 | 4 | -12/+94 |
| |\ | | | | | Network labels, EnableIPv6 flag, force disconnect | ||||
| | * | Add support for force disconnect1105-network-api | Joffrey F | 2016-08-31 | 4 | -4/+41 |
| | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| | * | Add support for labels and enable_ipv6 in create_network | Joffrey F | 2016-08-31 | 3 | -8/+53 |
| |/ | | | | | | Tests + docs Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | Merge pull request #1167 from docker/1075-from-env-version | Joffrey F | 2016-08-25 | 2 | -1/+10 |
| |\ | | | | | Support version parameter in `Client.from_env` | ||||
| | * | Support version parameter in `Client.from_env`1075-from-env-version | Joffrey F | 2016-08-25 | 2 | -1/+10 |
| | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | | Merge pull request #1168 from docker/aiden0z-master | Joffrey F | 2016-08-25 | 3 | -4/+22 |
| |\ \ | | | | | | | Support pids_limit in HostConfig | ||||
| | * | | Docs and tests for pids_limit.aiden0z-master | Joffrey F | 2016-08-23 | 2 | -3/+14 |
| | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| | * | | Merge branch 'master' of https://github.com/aiden0z/docker-py into ↵ | Joffrey F | 2016-08-23 | 1 | -1/+8 |
| | |\ \ | | |/ | |/| | | | | aiden0z-master | ||||
| | | * | fix #1094, support PidsLimit in host config | Aiden Luo | 2016-06-17 | 1 | -1/+8 |
| | | | | | | | | | | | | | Signed-off-by: Aiden Luo <aiden0xz@gmail.com> | ||||
| * | | | Merge pull request #1172 from fermayo/fix-utf8-envvars | Joffrey F | 2016-08-25 | 2 | -1/+21 |
| |\ \ \ | | | | | | | | | Fix creating containers with env vars with unicode characters | ||||
| | * | | | Fix creating containers with env vars with unicode characters | fermayo | 2016-08-25 | 2 | -1/+21 |
| |/ / / | | | | | | | | | | Signed-off-by: Fernando Mayo <fernando@docker.com> | ||||
| * | | | Merge pull request #1082 from masci/fix_stream_helper | Joffrey F | 2016-08-23 | 2 | -2/+42 |
| |\ \ \ | |/ / |/| | | Invoke self._result passing `json=True` when `decode=True` | ||||
| | * | | invoke self._result with json=True if decode=True | Massimiliano Pippi | 2016-06-07 | 2 | -2/+42 |
| | | | | | | | | | | | | | Signed-off-by: Massimiliano Pippi <massi@datadoghq.com> | ||||
| * | | | Merge branch 'DaoCloud-feature/memory_support' | Joffrey F | 2016-08-23 | 2 | -2/+30 |
| |\ \ \ | |||||
| | * | | | support MemoryReservation and KernelMemory | Kay Yan | 2016-08-23 | 2 | -2/+30 |
| |/ / / | | | | | | | | | | Signed-off-by: Kay Yan <kay.yan@daocloud.io> | ||||
| * | | | Merge branch 'srikalyan-master' | Joffrey F | 2016-08-23 | 3 | -3/+22 |
| |\ \ \ | |||||
| | * \ \ | Merge branch 'master' of https://github.com/srikalyan/docker-py into ↵ | Joffrey F | 2016-08-23 | 3 | -3/+22 |
| | |\ \ \ |/ / / / | | | | | | | | | srikalyan-master | ||||
| | * | | | Added support for user namespace. | Srikalyan Swayampakula | 2016-06-30 | 3 | -2/+21 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Srikalyan Swayampakula <srikalyansswayam@gmail.com> | ||||
| * | | | | Merge branch 'joshpurvis-jp-cpushares' | Joffrey F | 2016-08-23 | 5 | -4/+111 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch 'jp-cpushares' of https://github.com/joshpurvis/docker-py into ↵ | Joffrey F | 2016-08-23 | 5 | -4/+111 |
| | |\ \ \ \ |/ / / / / | | | | | | | | | | | joshpurvis-jp-cpushares | ||||
| | * | | | | Move cpu_shares and cpuset_cpu to HostConfig when API >= 1.18 | Josh Purvis | 2016-08-15 | 5 | -4/+110 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Josh Purvis <joshua.purvis@gmail.com> | ||||
| * | | | | | Merge pull request #1081 from tescalada/master | Joffrey F | 2016-08-23 | 1 | -2/+10 |
| |\ \ \ \ \ | | | | | | | | | | | | | 1059-Fixing a bug with multiple json objects | ||||
| | * | | | | | 1059-Fixing a bug with multiple json objects | Tristan Escalada | 2016-08-01 | 1 | -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/dnsopts | Joffrey F | 2016-08-23 | 3 | -1/+21 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Implemented dns_opt support (from api 1.21) | ||||
| | * | | | | | | Implemented dns_opt support (from api 1.21) | George Lester | 2016-08-07 | 3 | -1/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: George Lester <glester491@gmail.com> | ||||
| * | | | | | | | Merge pull request #1127 from docker/1085-service-support | Joffrey F | 2016-08-23 | 22 | -49/+1380 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Service support implementation | ||||
| | * | | | | | | | Private images support in create_service / update_service1085-service-support | Joffrey F | 2016-08-23 | 6 | -38/+91 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor auth header computation Add tasks methods and documentation. Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| | * | | | | | | | Add services documentation | Joffrey F | 2016-08-22 | 2 | -2/+163 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| | * | | | | | | | Rename LogDriver to DriverConfig for genericity | Joffrey F | 2016-08-22 | 2 | -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> | ||||
 |
index : delta/docker-py.git | |
| github.com: dotcloud/docker-py.git |
| summaryrefslogtreecommitdiff |