summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* ImageCollection.build now also returns build logs along with the built image ↵1702-build-logs-dockerclientJoffrey F2018-01-263-14/+24
| | | | | | | | reference BuildError.build_logs has a copy of the logs generator Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #1873 from docker/hongbin-image-loadJoffrey F2018-01-263-3/+26
|\ | | | | Return Image objects in ImageCollection.load
| * Error handling in ImageCollection.loadhongbin-image-loadJoffrey F2018-01-263-1/+13
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * Merge branch 'image-load' of https://github.com/hongbin/docker-py into ↵Joffrey F2018-01-261-2/+13
| |\ | | | | | | | | | | | | | | | hongbin-image-load Signed-off-by: Joffrey F <joffrey@docker.com>
| | * Return Image objects on image.loadHongbin Lu2017-09-101-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | In before, image.load returns what Docker API returns, which is a text stream. This commits propose an improvement for returning more useful information, which is a list of Image objects being loaded. Signed-off-by: Hongbin Lu <hongbin.lu@huawei.com>
* | | Merge pull request #1872 from docker/hnq90-add_exit_code_to_exec_runJoffrey F2018-01-263-7/+39
|\ \ \ | |/ / |/| | Also return exit code in exec_run
| * | Return tuple instead of dict in exec_runJoffrey F2018-01-263-14/+13
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | Merge branch 'add_exit_code_to_exec_run' of ↵Joffrey F2018-01-263-7/+40
| |\ \ |/ / / | | | | | | https://github.com/hnq90/docker-py into hnq90-add_exit_code_to_exec_run
| * | Add exit code to exec_runHuyNQ2017-11-133-7/+40
| | | | | | | | | | | | Signed-off-by: HuyNQ <huy@huynq.net>
* | | Merge pull request #1867 from docker/bump_api_version_1.35Joffrey F2018-01-2612-27/+129
|\ \ \ | | | | | | | | Bump default API version to 1.35
| * | | Bump default API version to 1.35Joffrey F2018-01-2612-27/+129
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | Add ContainerSpec.isolation support Add until support in logs Add condition support in wait Add workdir support in exec_create Signed-off-by: Joffrey F <joffrey@docker.com>
* | | Merge pull request #1871 from docker/fix-appveyorJoffrey F2018-01-263-4/+8
|\ \ \ | | | | | | | | Fix appveyor tests
| * | | Fix appveyor testsJoffrey F2018-01-263-4/+8
|/ / / | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | Merge pull request #1869 from mccalluc/patch-1Joffrey F2018-01-261-1/+1
|\ \ \ | | | | | | | | Replace missing "^" with "e"
| * | | Replace missing "^" with "e"mccalluc2018-01-261-1/+1
|/ / / | | | | | | Signed-off-by: Chuck McCallum <mccallucc+github@gmail.com>
* | | Merge pull request #1865 from docker/dperny-change-tls-defaultJoffrey F2018-01-251-7/+27
|\ \ \ | | | | | | | | Change default TLS version
| * | | Don't use PROTOCOL_TLSv1_2 directly to avoid ImportErrorsdperny-change-tls-defaultJoffrey F2018-01-241-15/+8
| | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | | Change default TLS versionDrew Erny2018-01-241-7/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Detects if python has an up-to-date version of OpenSSL that supports TLSv1.2. If it does, choose that as the default TLS version, instead of TLSv1. The Docker Engine and the majority of other Docker API servers should suppot TLSv1.2, and if they do not, the user can manually set a different (lower) version. Signed-off-by: Drew Erny <drew.erny@docker.com>
* | | | Merge pull request #1856 from docker/1855-platform-optionJoffrey F2018-01-247-7/+54
|\ \ \ \ | | | | | | | | | | Add support for experimental platform flag in build and pull
| * | | | Add support for experimental platform flag in build and pull1855-platform-optionJoffrey F2018-01-237-7/+54
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | | Merge pull request #1849 from johannespostler/1516-endport-port-documentationJoffrey F2018-01-241-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Switch ports in documentation for EndpointSpec (#1516)
| * | | | | Switch ports in documentation for EndpointSpecJohannes Postler2017-12-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Johannes Postler <johannes.postler@uibk.ac.at>
* | | | | | Merge pull request #1846 from feliperuhland/issue-1734-scale-methodJoffrey F2018-01-242-2/+67
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Added scale method to the Service model.
| * | | | | Fix test to make sure the initial mode is replicatedFelipe Ruhland2018-01-032-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Felipe Ruhland <felipe.ruhland@gmail.com>
| * | | | | Ensure that global containers are not scaledFelipe Ruhland2017-12-262-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Felipe Ruhland <felipe.ruhland@gmail.com>
| * | | | | Added scale method to the Service model.Felipe Ruhland2017-12-212-1/+39
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Felipe Ruhland <felipe.ruhland@gmail.com>
* | | | | Merge pull request #1866 from docker/jenkins-updateJoffrey F2018-01-243-6/+8
|\ \ \ \ \ | | | | | | | | | | | | Shift test matrix forward
| * | | | | Shift test matrix forwardjenkins-updateJoffrey F2018-01-243-6/+8
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | | Merge pull request #1863 from docker/python3.6Joffrey F2018-01-228-22/+36
|\ \ \ \ \ | | | | | | | | | | | | Python 3.6 support
| * | | | | 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
View Lorry Controller Status