summaryrefslogtreecommitdiff
path: root/docker
Commit message (Collapse)AuthorAgeFilesLines
* Fix regression on API < 1.25Viktor Adam2018-01-121-1/+8
| | | | Signed-off-by: Viktor Adam <rycus86@gmail.com>
* Ignore dockerignore lines that contain only whitespace1852-dockerignoreJoffrey F2018-01-031-1/+3
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* FormattingJoffrey F2017-12-191-2/+2
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge branch 'master' of https://github.com/qazbnm456/docker-py into ↵Joffrey F2017-12-191-1/+2
|\ | | | | | | qazbnm456-master
| * make the error message clearerBoik2017-12-161-1/+2
| | | | | | | | Signed-off-by: Boik <qazbnm456@gmail.com>
* | 2.8.0 devJoffrey F2017-12-191-1/+1
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Don't attempt to retrieve container's stderr if `auto_remove` was set2.7.0-releaseJoffrey F2017-12-191-1/+3
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Bump 2.7.0 + changelogJoffrey F2017-12-181-1/+1
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #1727 from mbelang/join-swarn-default-listen-addressJoffrey F2017-12-181-1/+1
|\ \ | | | | | | Add join_swarm default listen address
| * | Add join_swarm default listen addressMaxime Belanger2017-08-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Since the docker CLI adds a default listen address (0.0.0.0:2377) when joining a node to the swarm, the docker-py api will support the same behavior to easy configuration. Signed-off-by: Maxime Belanger <maxime.b.belanger@gmail.com>
* | | Merge pull request #1828 from pkit/fix_error_from_httpexJoffrey F2017-12-181-1/+1
|\ \ \ | | | | | | | | fixes create_api_error_from_http_exception()
| * | | fixes create_api_error_from_http_exception()Constantine Peresypkin2017-12-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `create_api_error_from_http_exception()` is never tested in the original code and will fail miserably when fed with empty `HTTPError` object see fixes in requests for this behaviour: https://github.com/requests/requests/pull/3179 Signed-off-by: Constantine Peresypkin <pconstantine@gmail.com>
* | | | Merge pull request #1836 from docker/1813-run-autoremoveJoffrey F2017-12-141-10/+19
|\ \ \ \ | | | | | | | | | | Retrieve container logs before container exits / is removed
| * | | | Retrieve container logs before container exits / is removed1813-run-autoremoveJoffrey F2017-12-141-10/+19
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | | Fixed DEFAULT API VERSION in docstrings.Felipe Ruhland2017-12-142-10/+10
|/ / / / | | | | | | | | | | | | Signed-off-by: Felipe Ruhland <felipe.ruhland@gmail.com>
* | | | Merge pull request #1807 from rycus86/update_service_from_prev_specJoffrey F2017-12-143-17/+80
|\ \ \ \ | | | | | | | | | | Update service from prev spec
| * | | | Renaming new argumentViktor Adam2017-12-142-33/+26
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Viktor Adam <rycus86@gmail.com>
| * | | | Fix resetting ContainerSpec properties to NoneViktor Adam2017-11-151-2/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Viktor Adam <rycus86@gmail.com>
| * | | | Service model update changesViktor Adam2017-11-143-27/+60
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Viktor Adam <rycus86@gmail.com>
| * | | | Update service using previous specViktor Adam2017-11-141-8/+44
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Viktor Adam <rycus86@gmail.com>
* | | | | Merge pull request #1834 from mhank/1823-support-update-orderJoffrey F2017-12-142-1/+14
|\ \ \ \ \ | | | | | | | | | | | | Add support for order property when updating a service
| * | | | | Correct default value of order parameterMichael Hankin2017-12-141-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Hankin <mjhankin1@gmail.com>
| * | | | | Add support for order property when updating a serviceMichael Hankin2017-12-122-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Hankin <mjhankin1@gmail.com>
* | | | | | Merge pull request #1835 from docker/1758-url-quote-pathJoffrey F2017-12-131-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix URL-quoting for resource names containing spaces
| * | | | | | Fix URL-quoting for resource names containing spaces1758-url-quote-pathJoffrey F2017-12-131-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | | | Merge branch 'master' of https://github.com/tz70s/docker-py into tz70s-masterJoffrey F2017-12-132-1/+24
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | | | | | Fix #1575 - Add cpu_rt_period and cpu_rt_runtime argsTzu-Chiao Yeh2017-08-132-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add cpu_rt_period and cpu_rt_runtime in hostconfig with version(1.25), types(int) checks. Also add version and type checks in dockertype unit test. Signed-off-by: Tzu-Chiao Yeh <su3g4284zo6y7@gmail.com>
| * | | | | | Improve ContainerError message computeJoffrey F2017-08-071-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | | | | | client.containers.run returns None if none of json-file or journald logging ↵Artem Bolshakov2017-08-072-3/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | drivers used Signed-off-by: Artem Bolshakov <either.free@gmail.com>
| * | | | | | Fix domainname documentation in create_container functionErik Johnson2017-08-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It looks like this was probably originally copypasta'ed from dns_search and not edited afterward. Signed-off-by: Erik Johnson <palehose@gmail.com>
| * | | | | | Generating regexp from .dockerignore file in a similar way as docker-ce.Jakub Goszczurny2017-08-011-8/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jakub Goszczurny <szczurmys@o2.pl>
| * | | | | | client.networks.create check_duplicates docs not reflective of behaviorDima Spivak2017-07-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1693 Signed-off-by: Dima Spivak <dima@spivak.ch>
| * | | | | | Fix #1673 check resource error in container network APIMatthew Berry2017-07-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Container network functions checked 'image' as resource ID and not 'container'. This caused a traceback when using container as named argument. Signed-off-by: Matthew Berry <mtberry89@gmail.com>
| * | | | | | Compose 1.14.0 hackJoffrey F2017-06-281-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | | | | | split_port should not break when passed a non-string argumentJoffrey F2017-06-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | | | | | dev versionJoffrey F2017-06-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | | | | Merge pull request #1816 from Anvil/honor-stoptimeoutJoffrey F2017-12-131-3/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix for #1815: make APIClient.stop honor container StopTimeout value
| * | | | | | | Fix for #1815: make APIClient.stop honor container StopTimeout valueDamien Nadé2017-11-211-3/+9
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Damien Nadé <anvil.github@livna.org>
* | | | | | | Merge pull request #1812 from rycus86/greedy_network_listJoffrey F2017-12-131-3/+18
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fetch network details with network lists greedily
| * | | | | | | Only allow greedy queries on the modelViktor Adam2017-11-212-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Viktor Adam <rycus86@gmail.com>
| * | | | | | | Fetch network details with network lists greedilyViktor Adam2017-11-162-4/+19
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Viktor Adam <rycus86@gmail.com>
* | | | | | | Merge pull request #1830 from mhank/1822-reformat-hostsJoffrey F2017-12-132-2/+8
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Fix format in which hosts are being stored for Swarm services
| * | | | | | Change format in which hosts are being stored for Swarm servicesMichael Hankin2017-12-052-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Hankin <mhank@users.noreply.github.com>
| * | | | | | Change format of extra hostsMichael Hankin2017-12-031-1/+1
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Michael Hankin <mjhankin1@gmail.com>
* | | | | | Merge pull request #1825 from docker/fix-context-buildingJoffrey F2017-12-111-7/+14
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Fix common issues with build context creation: inaccessible files and FIFOs
| * | | | | Fix common issues with build context creation: inaccessible files and fifosfix-context-buildingJoffrey F2017-11-291-7/+14
| | |/ / / | |/| | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | | container: fix docstring for containers()Anthony Sottile2017-12-071-1/+2
| |/ / / |/| | | | | | | | | | | Signed-off-by: Anthony Sottile <asottile@umich.edu>
* | | | Add missing call to string format in log messageAlex Villarreal2017-11-211-1/+1
| | | | | | | | | | | | Signed-off-by: Alejandro Villarreal <alex@alexvy86.com>
* | | | Merge pull request #1798 from docker/unlock_swarm_supportJoffrey F2017-11-202-1/+57
|\ \ \ \ | |/ / / |/| | | Unlock swarm support
| * | | Add unlock methods to Swarm modelunlock_swarm_supportJoffrey F2017-11-071-0/+8
| | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>