summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add Python 3.6 testingpython3.6Joffrey F2018-01-228-22/+36
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #1859 from rycus86/service_network_regressionJoffrey F2018-01-122-1/+32
|\ | | | | Fix service network regression on API < 1.25
| * Fix regression on API < 1.25Viktor Adam2018-01-122-1/+32
|/ | | | Signed-off-by: Viktor Adam <rycus86@gmail.com>
* Merge pull request #1853 from docker/1852-dockerignoreJoffrey F2018-01-032-1/+25
|\ | | | | Ignore dockerignore lines that contain only whitespace
| * Ignore dockerignore lines that contain only whitespace1852-dockerignoreJoffrey F2018-01-032-1/+25
|/ | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge branch 'qazbnm456-master'Joffrey F2017-12-191-1/+2
|\
| * 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>
* | Merge branch 'release'Joffrey F2017-12-192-1/+36
|\ \
| * \ Merge pull request #1838 from docker/2.7.0-release2.7.0Joffrey F2017-12-1933-99/+1063
| |\ \ | | | | | | | | 2.7.0 release
| | * | Don't attempt to retrieve container's stderr if `auto_remove` was set2.7.0-releaseJoffrey F2017-12-192-2/+16
| | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| | * | Bump 2.7.0 + changelogJoffrey F2017-12-182-1/+36
| | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | Merge pull request #1840 from docker/1813-autoremove-errorJoffrey F2017-12-192-2/+16
|\ \ \ \ | |_|/ / |/| | | Don't attempt to retrieve container's stderr if `auto_remove` was set
| * | | Don't attempt to retrieve container's stderr if `auto_remove` was set1813-autoremove-errorJoffrey F2017-12-192-2/+16
|/ / / | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | Merge pull request #1727 from mbelang/join-swarn-default-listen-addressJoffrey F2017-12-183-1/+50
|\ \ \ | | | | | | | | Add join_swarm default listen address
| * | | Add join_swarm default listen addressMaxime Belanger2017-08-293-1/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-182-2/+16
|\ \ \ \ | | | | | | | | | | fixes create_api_error_from_http_exception()
| * | | | fixes create_api_error_from_http_exception()Constantine Peresypkin2017-12-182-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `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-144-18/+43
|\ \ \ \ \ | | | | | | | | | | | | Retrieve container logs before container exits / is removed
| * | | | | Retrieve container logs before container exits / is removed1813-run-autoremoveJoffrey F2017-12-144-18/+43
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | | | Merge pull request #1837 from feliperuhland/fix_default_api_versionJoffrey F2017-12-142-10/+10
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Updated DEFAULT API VERSION in docstrings.
| * | | | | 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-146-21/+659
|\ \ \ \ \ | | | | | | | | | | | | Update service from prev spec
| * | | | | Renaming new argumentViktor Adam2017-12-143-48/+41
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Viktor Adam <rycus86@gmail.com>
| * | | | | Fix resetting ContainerSpec properties to NoneViktor Adam2017-11-152-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Viktor Adam <rycus86@gmail.com>
| * | | | | Attempting to make service update tests less flakyViktor Adam2017-11-152-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Viktor Adam <rycus86@gmail.com>
| * | | | | Service model update changesViktor Adam2017-11-146-56/+345
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Viktor Adam <rycus86@gmail.com>
| * | | | | Update service using previous specViktor Adam2017-11-142-8/+357
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Viktor Adam <rycus86@gmail.com>
* | | | | | Merge pull request #1834 from mhank/1823-support-update-orderJoffrey F2017-12-143-1/+32
|\ \ \ \ \ \ | | | | | | | | | | | | | | 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-123-1/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Hankin <mjhankin1@gmail.com>
* | | | | | | Merge pull request #1835 from docker/1758-url-quote-pathJoffrey F2017-12-132-1/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix URL-quoting for resource names containing spaces
| * | | | | | | Fix URL-quoting for resource names containing spaces1758-url-quote-pathJoffrey F2017-12-132-1/+8
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | | | | Merge branch 'tz70s-master'Joffrey F2017-12-134-1/+60
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | | | | | | Add integration test for CPU realtime optionsJoffrey F2017-12-131-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | | | | | | Merge branch 'master' of https://github.com/tz70s/docker-py into tz70s-masterJoffrey F2017-12-133-1/+46
| |\ \ \ \ \ \ \ |/ / / / / / / / | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | | | | | | Fix #1575 - Add cpu_rt_period and cpu_rt_runtime argsTzu-Chiao Yeh2017-08-133-1/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | | | Merge pull request #1789 from timvisee/chardet-fixJoffrey F2017-12-131-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Require at least requests v2.14.2 to update old chardet
| * | | | | | | | Require at least requests v2.14.2 to fix chardettimvisee2017-11-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: timvisee <timvisee@gmail.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-133-7/+28
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fetch network details with network lists greedily
| * | | | | | | | | | Only allow greedy queries on the modelViktor Adam2017-11-214-54/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Viktor Adam <rycus86@gmail.com>
| * | | | | | | | | | Fixing integration testsViktor Adam2017-11-192-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Viktor Adam <rycus86@gmail.com>
| * | | | | | | | | | Fetch network details with network lists greedilyViktor Adam2017-11-165-8/+70
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Viktor Adam <rycus86@gmail.com>
* | | | | | | | | | Merge pull request #1830 from mhank/1822-reformat-hostsJoffrey F2017-12-133-4/+10
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | Fix format in which hosts are being stored for Swarm services
| * | | | | | | | | Change format in which hosts are being stored for Swarm servicesMichael Hankin2017-12-053-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Hankin <mhank@users.noreply.github.com>
| * | | | | | | | | Change format of extra hostsMichael Hankin2017-12-033-4/+4
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Hankin <mjhankin1@gmail.com>
View Lorry Controller Status