docker
/
docker-py
mirror of https://github.com/docker/docker-py.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,415 Commits 23 Branches 129 Tags 8.4 MiB
Commit Graph

2415 Commits

Author SHA1 Message Date
Joffrey F a05922e949
Merge pull request #1881 from docker/pytest-asserts 
Use pytest asserts
 2018-01-30 16:29:07 -08:00
Joffrey F 3422211309 Use pytest asserts 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-30 14:26:24 -08:00
Joffrey F de88ab39c0
Merge pull request #1880 from docker/1841-tar-broken-symlinks 
Do not break when archiving broken symlinks
 2018-01-29 19:11:23 -08:00
Joffrey F 4e34300379 Do not break when archiving broken symlinks 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-29 18:27:12 -08:00
Joffrey F 4ff296247b Merge branch 'funkyfuture-container_exec_run' 2018-01-29 16:35:19 -08:00
Joffrey F 947c47f609 Move ExecResult definition to models.containers 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-29 16:34:03 -08:00
Joffrey F 600cc15cbc Merge branch 'container_exec_run' of https://github.com/funkyfuture/docker-py into funkyfuture-container_exec_run 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-29 16:29:04 -08:00
Joffrey F 5728eebf79
Merge pull request #1874 from docker/1774-export-methods 
Update save / export methods to return data generators
 2018-01-29 16:19:45 -08:00
Frank Sachsenheim a63b726d40 Container.exec_run returns a namedtuple w/ attrs exit_code & output 
Signed-off-by: Frank Sachsenheim <funkyfuture@riseup.net>
 2018-01-28 01:44:28 +01:00
Frank Sachsenheim ad208dfd29 Container.exec_run returns None as exit_code if stream or socket 
Signed-off-by: Frank Sachsenheim <funkyfuture@riseup.net>
 2018-01-28 01:43:42 +01:00
Joffrey F 9c0332eb2e
Merge pull request #1875 from docker/1702-build-logs-dockerclient 
ImageCollection.build now also returns build logs
 2018-01-26 16:32:29 -08:00
Joffrey F 388f291b13 Update save / export methods to return data generators 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-26 16:23:55 -08:00
Joffrey F 631cc3c121 ImageCollection.build now also returns build logs along with the built image reference 
BuildError.build_logs has a copy of the logs generator

Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-26 15:59:46 -08:00
Joffrey F deb8222d69
Merge pull request #1873 from docker/hongbin-image-load 
Return Image objects in ImageCollection.load
 2018-01-26 14:45:09 -08:00
Joffrey F 84d454551c
Merge pull request #1872 from docker/hnq90-add_exit_code_to_exec_run 
Also return exit code in exec_run
 2018-01-26 14:35:45 -08:00
Joffrey F 8b5a52ae0c Error handling in ImageCollection.load 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-26 14:34:20 -08:00
Joffrey F 601c5a41d2 Merge branch 'image-load' of https://github.com/hongbin/docker-py into hongbin-image-load 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-26 14:25:11 -08:00
Joffrey F 6e6eaece81 Return tuple instead of dict in exec_run 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-26 14:21:23 -08:00
Joffrey F b0cc4b5520 Merge branch 'add_exit_code_to_exec_run' of https://github.com/hnq90/docker-py into hnq90-add_exit_code_to_exec_run 2018-01-26 14:13:15 -08:00
Joffrey F 04eb7a2a99
Merge pull request #1867 from docker/bump_api_version_1.35 
Bump default API version to 1.35
 2018-01-26 14:11:07 -08:00
Joffrey F abd60aedc7 Bump default API version to 1.35 
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>
 2018-01-26 13:56:01 -08:00
Joffrey F 9538258371
Merge pull request #1871 from docker/fix-appveyor 
Fix appveyor tests
 2018-01-26 13:45:10 -08:00
Joffrey F a5490ad0be Fix appveyor tests 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-26 13:44:31 -08:00
Joffrey F ba46201ca6
Merge pull request #1869 from mccalluc/patch-1 
Replace missing "^" with "e"
 2018-01-26 11:54:22 -08:00
mccalluc 24bd5d8e53
Replace missing "^" with "e" 
Signed-off-by: Chuck McCallum <mccallucc+github@gmail.com>
 2018-01-26 10:44:15 -05:00
Joffrey F 9e2148dcc4
Merge pull request #1865 from docker/dperny-change-tls-default 
Change default TLS version
 2018-01-25 13:08:12 -08:00
Joffrey F a15a1d2fdd
Merge pull request #1856 from docker/1855-platform-option 
Add support for experimental platform flag in build and pull
 2018-01-24 18:12:50 -08:00
Joffrey F f85f31a91a
Merge pull request #1849 from johannespostler/1516-endport-port-documentation 
Switch ports in documentation for EndpointSpec (#1516)
 2018-01-24 18:09:43 -08:00
Joffrey F 4590e2a816
Merge pull request #1846 from feliperuhland/issue-1734-scale-method 
Added scale method to the Service model.
 2018-01-24 18:08:35 -08:00
Joffrey F bab7ca3cde Don't use PROTOCOL_TLSv1_2 directly to avoid ImportErrors 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-24 18:05:10 -08:00
Drew Erny 500286d51e Change default TLS version 
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>
 2018-01-24 18:05:10 -08:00
Joffrey F 766d890558
Merge pull request #1866 from docker/jenkins-update 
Shift test matrix forward
 2018-01-24 18:04:42 -08:00
Joffrey F ccd79323da Shift test matrix forward 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-24 11:39:43 -08:00
Joffrey F f95b958429 Add support for experimental platform flag in build and pull 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-23 16:59:09 -08:00
Joffrey F bc8ada2f74
Merge pull request #1863 from docker/python3.6 
Python 3.6 support
 2018-01-22 18:28:18 -08:00
Joffrey F 0acef5f6d2 Add Python 3.6 testing 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-22 18:08:01 -08:00
Joffrey F a28b9ffd85
Merge pull request #1859 from rycus86/service_network_regression 
Fix service network regression on API < 1.25
 2018-01-12 14:49:19 -08:00
Viktor Adam e75a03fd6d Fix regression on API < 1.25 
Signed-off-by: Viktor Adam <rycus86@gmail.com>
 2018-01-12 22:18:53 +00:00
Joffrey F bf5e7702df
Merge pull request #1853 from docker/1852-dockerignore 
Ignore dockerignore lines that contain only whitespace
 2018-01-03 13:37:39 -08:00
Joffrey F bf06a361e2 Ignore dockerignore lines that contain only whitespace 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-03 12:16:21 -08:00
Felipe Ruhland 663c6089e9 Fix test to make sure the initial mode is replicated 
Signed-off-by: Felipe Ruhland <felipe.ruhland@gmail.com>
 2018-01-03 00:21:56 -02:00
Johannes Postler 1bb4155dcb Switch ports in documentation for EndpointSpec 
Signed-off-by: Johannes Postler <johannes.postler@uibk.ac.at>
 2017-12-27 17:01:49 +01:00
Felipe Ruhland 0e0a852680 Ensure that global containers are not scaled 
Signed-off-by: Felipe Ruhland <felipe.ruhland@gmail.com>
 2017-12-26 18:30:28 -02:00
Felipe Ruhland edb9e3c2ae Added scale method to the Service model. 
Signed-off-by: Felipe Ruhland <felipe.ruhland@gmail.com>
 2017-12-21 23:13:18 -02:00
Joffrey F 190d95c61c Merge branch 'qazbnm456-master' 2017-12-19 14:38:55 -08:00
Joffrey F 758344fdf4 Formatting 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-12-19 14:38:38 -08:00
Joffrey F 0a55ff3a41 Merge branch 'master' of https://github.com/qazbnm456/docker-py into qazbnm456-master 2017-12-19 14:37:44 -08:00
Joffrey F 9fc45f108a 2.8.0 dev 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-12-19 14:37:17 -08:00
Joffrey F 518655287a Merge branch 'release' 2017-12-19 14:36:48 -08:00
Joffrey F 5bed7b8f0d
Merge pull request #1838 from docker/2.7.0-release 
2.7.0 release
 2017-12-19 14:25:53 -08:00