| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Use pytest assertspytest-asserts | Joffrey F | 2018-01-30 | 28 | -1608/+1270 |
| | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | Merge branch 'funkyfuture-container_exec_run' | Joffrey F | 2018-01-29 | 1 | -6/+16 |
| |\ | |||||
| | * | Move ExecResult definition to models.containers | Joffrey F | 2018-01-29 | 3 | -13/+13 |
| | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| | * | Merge branch 'container_exec_run' of ↵ | Joffrey F | 2018-01-29 | 3 | -8/+18 |
| | |\ |/ / | | | | | | | | | https://github.com/funkyfuture/docker-py into funkyfuture-container_exec_run Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| | * | Container.exec_run returns a namedtuple w/ attrs exit_code & output | Frank Sachsenheim | 2018-01-28 | 3 | -6/+14 |
| | | | | | | | | | Signed-off-by: Frank Sachsenheim <funkyfuture@riseup.net> | ||||
| | * | Container.exec_run returns None as exit_code if stream or socket | Frank Sachsenheim | 2018-01-28 | 1 | -5/+7 |
| | | | | | | | | | Signed-off-by: Frank Sachsenheim <funkyfuture@riseup.net> | ||||
| * | | Merge pull request #1874 from docker/1774-export-methods | Joffrey F | 2018-01-29 | 5 | -20/+53 |
| |\ \ | |/ |/| | Update save / export methods to return data generators | ||||
| | * | Update save / export methods to return data generators1774-export-methods | Joffrey F | 2018-01-26 | 5 | -20/+53 |
| | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | | Merge pull request #1875 from docker/1702-build-logs-dockerclient | Joffrey F | 2018-01-26 | 3 | -14/+24 |
| |\ \ | |/ |/| | ImageCollection.build now also returns build logs | ||||
| | * | ImageCollection.build now also returns build logs along with the built image ↵1702-build-logs-dockerclient | Joffrey F | 2018-01-26 | 3 | -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-load | Joffrey F | 2018-01-26 | 3 | -3/+26 |
| |\ | | | | | Return Image objects in ImageCollection.load | ||||
| | * | Error handling in ImageCollection.loadhongbin-image-load | Joffrey F | 2018-01-26 | 3 | -1/+13 |
| | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| | * | Merge branch 'image-load' of https://github.com/hongbin/docker-py into ↵ | Joffrey F | 2018-01-26 | 1 | -2/+13 |
| | |\ | | | | | | | | | | | | | | | | hongbin-image-load Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| | | * | Return Image objects on image.load | Hongbin Lu | 2017-09-10 | 1 | -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_run | Joffrey F | 2018-01-26 | 3 | -7/+39 |
| |\ \ \ | |/ / |/| | | Also return exit code in exec_run | ||||
| | * | | Return tuple instead of dict in exec_run | Joffrey F | 2018-01-26 | 3 | -14/+13 |
| | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| | * | | Merge branch 'add_exit_code_to_exec_run' of ↵ | Joffrey F | 2018-01-26 | 3 | -7/+40 |
| | |\ \ |/ / / | | | | | | | https://github.com/hnq90/docker-py into hnq90-add_exit_code_to_exec_run | ||||
| | * | | Add exit code to exec_run | HuyNQ | 2017-11-13 | 3 | -7/+40 |
| | | | | | | | | | | | | | Signed-off-by: HuyNQ <huy@huynq.net> | ||||
| * | | | Merge pull request #1867 from docker/bump_api_version_1.35 | Joffrey F | 2018-01-26 | 12 | -27/+129 |
| |\ \ \ | | | | | | | | | Bump default API version to 1.35 | ||||
| | * | | | Bump default API version to 1.35 | Joffrey F | 2018-01-26 | 12 | -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-appveyor | Joffrey F | 2018-01-26 | 3 | -4/+8 |
| |\ \ \ | | | | | | | | | Fix appveyor tests | ||||
| | * | | | Fix appveyor tests | Joffrey F | 2018-01-26 | 3 | -4/+8 |
| |/ / / | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | | | Merge pull request #1869 from mccalluc/patch-1 | Joffrey F | 2018-01-26 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | Replace missing "^" with "e" | ||||
| | * | | | Replace missing "^" with "e" | mccalluc | 2018-01-26 | 1 | -1/+1 |
| |/ / / | | | | | | | Signed-off-by: Chuck McCallum <mccallucc+github@gmail.com> | ||||
| * | | | Merge pull request #1865 from docker/dperny-change-tls-default | Joffrey F | 2018-01-25 | 1 | -7/+27 |
| |\ \ \ | | | | | | | | | Change default TLS version | ||||
| | * | | | Don't use PROTOCOL_TLSv1_2 directly to avoid ImportErrorsdperny-change-tls-default | Joffrey F | 2018-01-24 | 1 | -15/+8 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| | * | | | Change default TLS version | Drew Erny | 2018-01-24 | 1 | -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-option | Joffrey F | 2018-01-24 | 7 | -7/+54 |
| |\ \ \ \ | | | | | | | | | | | Add support for experimental platform flag in build and pull | ||||
| | * | | | | Add support for experimental platform flag in build and pull1855-platform-option | Joffrey F | 2018-01-23 | 7 | -7/+54 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | | | | | Merge pull request #1849 from johannespostler/1516-endport-port-documentation | Joffrey F | 2018-01-24 | 1 | -2/+2 |
| |\ \ \ \ \ | | | | | | | | | | | | | Switch ports in documentation for EndpointSpec (#1516) | ||||
| | * | | | | | Switch ports in documentation for EndpointSpec | Johannes Postler | 2017-12-27 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Johannes Postler <johannes.postler@uibk.ac.at> | ||||
| * | | | | | | Merge pull request #1846 from feliperuhland/issue-1734-scale-method | Joffrey F | 2018-01-24 | 2 | -2/+67 |
| |\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Added scale method to the Service model. | ||||
| | * | | | | | Fix test to make sure the initial mode is replicated | Felipe Ruhland | 2018-01-03 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Felipe Ruhland <felipe.ruhland@gmail.com> | ||||
| | * | | | | | Ensure that global containers are not scaled | Felipe Ruhland | 2017-12-26 | 2 | -1/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Felipe Ruhland <felipe.ruhland@gmail.com> | ||||
| | * | | | | | Added scale method to the Service model. | Felipe Ruhland | 2017-12-21 | 2 | -1/+39 |
| | |/ / / / | | | | | | | | | | | | | | | | Signed-off-by: Felipe Ruhland <felipe.ruhland@gmail.com> | ||||
| * | | | | | Merge pull request #1866 from docker/jenkins-update | Joffrey F | 2018-01-24 | 3 | -6/+8 |
| |\ \ \ \ \ | | | | | | | | | | | | | Shift test matrix forward | ||||
| | * | | | | | Shift test matrix forwardjenkins-update | Joffrey F | 2018-01-24 | 3 | -6/+8 |
| |/ / / / / | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | | | | | Merge pull request #1863 from docker/python3.6 | Joffrey F | 2018-01-22 | 8 | -22/+36 |
| |\ \ \ \ \ | | | | | | | | | | | | | Python 3.6 support | ||||
| | * | | | | | Add Python 3.6 testingpython3.6 | Joffrey F | 2018-01-22 | 8 | -22/+36 |
| |/ / / / / | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | | | | | Merge pull request #1859 from rycus86/service_network_regression | Joffrey F | 2018-01-12 | 2 | -1/+32 |
| |\ \ \ \ \ | |_|/ / / |/| | | | | Fix service network regression on API < 1.25 | ||||
| | * | | | | Fix regression on API < 1.25 | Viktor Adam | 2018-01-12 | 2 | -1/+32 |
| |/ / / / | | | | | | | | | | | | | Signed-off-by: Viktor Adam <rycus86@gmail.com> | ||||
| * | | | | Merge pull request #1853 from docker/1852-dockerignore | Joffrey F | 2018-01-03 | 2 | -1/+25 |
| |\ \ \ \ | |/ / / |/| | | | Ignore dockerignore lines that contain only whitespace | ||||
| | * | | | Ignore dockerignore lines that contain only whitespace1852-dockerignore | Joffrey F | 2018-01-03 | 2 | -1/+25 |
| |/ / / | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | | | Merge branch 'qazbnm456-master' | Joffrey F | 2017-12-19 | 1 | -1/+2 |
| |\ \ \ | |||||
| | * | | | Formatting | Joffrey F | 2017-12-19 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| | * | | | Merge branch 'master' of https://github.com/qazbnm456/docker-py into ↵ | Joffrey F | 2017-12-19 | 1 | -1/+2 |
| | |\ \ \ |/ / / / | | | | | | | | | qazbnm456-master | ||||
| | * | | | make the error message clearer | Boik | 2017-12-16 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Boik <qazbnm456@gmail.com> | ||||
| * | | | | 2.8.0 dev | Joffrey F | 2017-12-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | | | | Merge branch 'release' | Joffrey F | 2017-12-19 | 2 | -1/+36 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge pull request #1838 from docker/2.7.0-release2.7.0 | Joffrey F | 2017-12-19 | 33 | -99/+1063 |
| | |\ \ \ \ | | | | | | | | | | | | | 2.7.0 release | ||||
 |
index : delta/docker-py.git | |
| github.com: dotcloud/docker-py.git |
| summaryrefslogtreecommitdiff |