summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Refuse API version < 1.21 ; Remove associated code pathscleanup_deprecatedJoffrey F2018-01-3120-519/+140
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Remove parameters and methods marked as deprecatedJoffrey F2018-01-317-119/+10
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #1886 from docker/1878-publishmodeJoffrey F2018-01-314-7/+118
|\ | | | | Add support for publish mode for endpointspec ports
| * Add support for publish mode for endpointspec ports1878-publishmodeJoffrey F2018-01-314-7/+118
|/ | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #1885 from docker/improve_authconfig_genconfig_separationJoffrey F2018-01-3112-111/+149
|\ | | | | Improve separation between auth_configs and general_configs
| * Improve separation between auth_configs and general_configsimprove_authconfig_genconfig_separationJoffrey F2018-01-3012-111/+149
|/ | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #1879 from docker/mtsmfm-masterJoffrey F2018-01-3011-104/+313
|\ | | | | Add support for detachKeys configuration
| * Update detach tests to work with AF_INET as wellmtsmfm-masterJoffrey F2018-01-304-36/+54
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * Use config.json for detachKeysFumiaki MATSUSHIMA2018-01-3010-103/+294
|/ | | | Signed-off-by: Fumiaki Matsushima <mtsmfm@gmail.com>
* Merge pull request #1883 from docker/1761-dockerclient-pullJoffrey F2018-01-304-6/+40
|\ | | | | Properly support pulling all tags in DockerClient.images.pull
| * Properly support pulling all tags in DockerClient.images.pull1761-dockerclient-pullJoffrey F2018-01-304-6/+40
|/ | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #1881 from docker/pytest-assertsJoffrey F2018-01-3028-1608/+1270
|\ | | | | Use pytest asserts
| * Use pytest assertspytest-assertsJoffrey F2018-01-3028-1608/+1270
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #1880 from docker/1841-tar-broken-symlinksJoffrey F2018-01-292-1/+28
|\ \ | |/ |/| Do not break when archiving broken symlinks
| * Do not break when archiving broken symlinks1841-tar-broken-symlinksJoffrey F2018-01-292-1/+28
|/ | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge branch 'funkyfuture-container_exec_run'Joffrey F2018-01-291-6/+16
|\
| * Move ExecResult definition to models.containersJoffrey F2018-01-293-13/+13
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * Merge branch 'container_exec_run' of ↵Joffrey F2018-01-293-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 & outputFrank Sachsenheim2018-01-283-6/+14
| | | | | | | | Signed-off-by: Frank Sachsenheim <funkyfuture@riseup.net>
| * Container.exec_run returns None as exit_code if stream or socketFrank Sachsenheim2018-01-281-5/+7
| | | | | | | | Signed-off-by: Frank Sachsenheim <funkyfuture@riseup.net>
* | Merge pull request #1874 from docker/1774-export-methodsJoffrey F2018-01-295-20/+53
|\ \ | |/ |/| Update save / export methods to return data generators
| * Update save / export methods to return data generators1774-export-methodsJoffrey F2018-01-265-20/+53
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #1875 from docker/1702-build-logs-dockerclientJoffrey F2018-01-263-14/+24
|\ \ | |/ |/| ImageCollection.build now also returns build logs
| * 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