summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update DockerClient.images.pull to always stream responseadw1n-i2116Joffrey F2018-11-283-9/+38
| | | | | | Also raise a warning when users attempt to specify the "stream" parameter Signed-off-by: Joffrey F <joffrey@docker.com>
* Fix pulling images with `stream=True`adw1n2018-11-284-4/+9
| | | | | | | | | | | | | | | | | Pulling an image with option `stream=True` like this: ``` client.api.pull('docker.io/user/repo_name', tag='latest', stream=True) ``` without consuming the generator oftentimes results in premature drop of the connection. Docker daemon tries to send progress of pulling the image to the client, but it encounters an error (broken pipe) and therefore cancells the pull action: ``` Thread 1 "dockerd-dev" received signal SIGPIPE, Broken pipe. ERRO[2018-09-03T05:12:35.746497638+02:00] Not continuing with pull after error: context canceled ``` As described in issue #2116, even though client receives response with status code 200, image is not pulled. Closes #2116 Signed-off-by: Przemysław Adamek <adw1n@users.noreply.github.com>
* Merge pull request #2183 from docker/c6356-longpath-prefixJoffrey F2018-11-263-2/+72
|\ | | | | Correctly handle longpath prefix in process_dockerfile when joining paths
| * Correctly handle longpath prefix in process_dockerfile when joining pathsc6356-longpath-prefixJoffrey F2018-11-263-2/+72
|/ | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #2178 from little-dude/fix_deprecationJoffrey F2018-11-262-13/+13
|\ | | | | tests: fix failure due to pytest deprecation
| * tests: bump pytest-timeoutCorentin Henry2018-11-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Corentin Henry <corentinhenry@gmail.com> pytest-timeout 1.2.1 seems to be incompatible with pytest 3.6.3: INTERNALERROR> Traceback (most recent call last): INTERNALERROR> File "/usr/local/lib/python2.7/site-packages/_pytest/main.py", line 185, in wrap_session INTERNALERROR> session.exitstatus = doit(config, session) or 0 INTERNALERROR> File "/usr/local/lib/python2.7/site-packages/_pytest/main.py", line 225, in _main INTERNALERROR> config.hook.pytest_runtestloop(session=session) INTERNALERROR> File "/usr/local/lib/python2.7/site-packages/pluggy/hooks.py", line 284, in __call__ INTERNALERROR> return self._hookexec(self, self.get_hookimpls(), kwargs) INTERNALERROR> File "/usr/local/lib/python2.7/site-packages/pluggy/manager.py", line 67, in _hookexec INTERNALERROR> return self._inner_hookexec(hook, methods, kwargs) INTERNALERROR> File "/usr/local/lib/python2.7/site-packages/pluggy/manager.py", line 61, in <lambda> INTERNALERROR> firstresult=hook.spec.opts.get("firstresult") if hook.spec else False, INTERNALERROR> File "/usr/local/lib/python2.7/site-packages/pluggy/callers.py", line 208, in _multicall INTERNALERROR> return outcome.get_result() INTERNALERROR> File "/usr/local/lib/python2.7/site-packages/pluggy/callers.py", line 81, in get_result INTERNALERROR> _reraise(*ex) # noqa INTERNALERROR> File "/usr/local/lib/python2.7/site-packages/pluggy/callers.py", line 187, in _multicall INTERNALERROR> res = hook_impl.function(*args) INTERNALERROR> File "/usr/local/lib/python2.7/site-packages/_pytest/main.py", line 246, in pytest_runtestloop INTERNALERROR> item.config.hook.pytest_runtest_protocol(item=item, nextitem=nextitem) INTERNALERROR> File "/usr/local/lib/python2.7/site-packages/pluggy/hooks.py", line 284, in __call__ INTERNALERROR> return self._hookexec(self, self.get_hookimpls(), kwargs) INTERNALERROR> File "/usr/local/lib/python2.7/site-packages/pluggy/manager.py", line 67, in _hookexec INTERNALERROR> return self._inner_hookexec(hook, methods, kwargs) INTERNALERROR> File "/usr/local/lib/python2.7/site-packages/pluggy/manager.py", line 61, in <lambda> INTERNALERROR> firstresult=hook.spec.opts.get("firstresult") if hook.spec else False, INTERNALERROR> File "/usr/local/lib/python2.7/site-packages/pluggy/callers.py", line 208, in _multicall INTERNALERROR> return outcome.get_result() INTERNALERROR> File "/usr/local/lib/python2.7/site-packages/pluggy/callers.py", line 81, in get_result INTERNALERROR> _reraise(*ex) # noqa INTERNALERROR> File "/usr/local/lib/python2.7/site-packages/pluggy/callers.py", line 182, in _multicall INTERNALERROR> next(gen) # first yield INTERNALERROR> File "/usr/local/lib/python2.7/site-packages/pytest_timeout.py", line 76, in pytest_runtest_protocol INTERNALERROR> timeout_setup(item) INTERNALERROR> File "/usr/local/lib/python2.7/site-packages/pytest_timeout.py", line 104, in timeout_setup INTERNALERROR> timeout, method = get_params(item) INTERNALERROR> File "/usr/local/lib/python2.7/site-packages/pytest_timeout.py", line 162, in get_params INTERNALERROR> timeout, method = _parse_marker(item.keywords['timeout']) INTERNALERROR> File "/usr/local/lib/python2.7/site-packages/pytest_timeout.py", line 178, in _parse_marker INTERNALERROR> if not marker.args and not marker.kwargs: INTERNALERROR> File "/usr/local/lib/python2.7/site-packages/_pytest/mark/structures.py", line 25, in warned INTERNALERROR> warnings.warn(warning, stacklevel=2) INTERNALERROR> RemovedInPytest4Warning: MarkInfo objects are deprecated as they contain merged marks which are hard to deal with correctly. INTERNALERROR> Please use node.get_closest_marker(name) or node.iter_markers(name). INTERNALERROR> Docs: https://docs.pytest.org/en/latest/mark.html#updating-code
| * tests: fix failure due to pytest deprecationCorentin Henry2018-11-211-12/+12
|/ | | | Signed-off-by: Corentin Henry <corentinhenry@gmail.com>
* Fix versions script to accept versions without -ce suffixJoffrey F2018-11-081-1/+1
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #2172 from docker/fix_docsJoffrey F2018-11-0811-48/+137
|\ | | | | Documentation fixes
| * Remove prematurely committed filefix_docsJoffrey F2018-11-081-57/+0
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * Fix file mode in image.save examplesJoffrey F2018-11-082-2/+2
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * Add doc example for get_archiveJoffrey F2018-11-082-0/+23
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * Properly convert non-string filters to expected string formatJoffrey F2018-11-082-3/+6
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * Disallow incompatible combination stats(decode=True, stream=False)Joffrey F2018-11-082-2/+8
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * Fix incorrect return info for inspect_serviceJoffrey F2018-11-081-1/+2
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * Document attr caching for Container objectsJoffrey F2018-11-081-1/+6
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * Update links docs and fix bug in normalize_linksJoffrey F2018-11-083-10/+15
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * Improved LogConfig documentationJoffrey F2018-11-084-17/+45
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * Improve ulimits documentationJoffrey F2018-11-084-3/+21
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * Fix docs examples to work with Python 3Joffrey F2018-11-084-12/+69
|/ | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #2169 from docker/2124-image-save-with-nameJoffrey F2018-11-082-2/+45
|\ | | | | Add named parameter to image.save to identify which repository name to use in the resulting tarball
| * Add named parameter to image.save to identify which repository name to use ↵2124-image-save-with-nameJoffrey F2018-11-062-2/+45
|/ | | | | | in the resulting tarball Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #2165 from docker/ssh_protocol_supportJoffrey F2018-11-0616-108/+290
|\ | | | | SSH protocol support
| * Rewrite utils.parse_host to detect more invalid addresses.ssh_protocol_supportJoffrey F2018-11-013-64/+83
| | | | | | | | | | | | | | | | The method now uses parsing methods from urllib to better split provided URLs. Addresses containing query strings, parameters, passwords or fragments no longer fail silently. SSH addresses containing paths are no longer accepted. Signed-off-by: Joffrey F <joffrey@docker.com>
| * Clear error for cancellable streams over SSHJoffrey F2018-11-013-2/+18
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * Update tests to properly dispose of client instances in tearDownJoffrey F2018-11-014-46/+48
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * Update tests for ssh protocol compatibilityJoffrey F2018-11-012-0/+5
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * Remove misleading fileno method from NpipeSocket classJoffrey F2018-11-011-4/+0
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * Add support for SSH protocol in base_urlJoffrey F2018-11-014-5/+145
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * Add paramiko requirement for SSH transportJoffrey F2018-11-012-0/+4
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #2168 from adamtheturtle/patch-1Joffrey F2018-11-041-1/+1
|\ \ | |/ |/| Add a missing space in a log message
| * Add a missing space in a log messageAdam Dangoor2018-11-051-1/+1
|/ | | | Signed-off-by: Adam Dangoor <adamdangoor@gmail.com>
* Update version detection script for CIJoffrey F2018-11-011-15/+24
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Add xfail to ignore 18.09 beta bugJoffrey F2018-10-311-0/+5
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #2161 from docker/bump_requestsJoffrey F2018-10-291-1/+1
|\ | | | | Bump requests dependency in requirements.txt (CVE-2018-18074)
| * Bump requests dependency in requirements.txt (CVE-2018-18074)bump_requestsJoffrey F2018-10-291-1/+1
|/ | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #2155 from docker/bump_pyopensslJoffrey F2018-10-172-2/+2
|\ | | | | Bump pyopenssl to prevent installation of vulnerable version
| * Bump pyopenssl to prevent installation of vulnerable versionbump_pyopensslJoffrey F2018-10-172-2/+2
| | | | | | | | | | | | | | | | CVE refs: CVE-2018-1000807 CVE-2018-1000808 Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #2145 from mirake/fix-typosJoffrey F2018-10-172-2/+2
|\ \ | |/ |/| Fix typo: Addtional -> Additional
| * Fix typo: Addtional -> AdditionalRui Cao2018-09-272-2/+2
|/ | | | Signed-off-by: Rui Cao <ruicao@alauda.io>
* Merge pull request #2135 from docker/2133-services-docsJoffrey F2018-09-142-26/+30
|\ | | | | Fix docs for Service objects
| * Fix docs for Service objects2133-services-docsJoffrey F2018-09-142-26/+30
|/ | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #2111 from bfirsh/document-defaults-of-logsJoffrey F2018-09-142-10/+10
|\ | | | | Document defaults of logs()
| * Document defaults of logs()Ben Firshman2018-08-122-10/+10
| | | | | | | | | | | | This is not obvious because some are True by default. Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* | Merge pull request #2129 from adw1n/i2122-docsJoffrey F2018-09-141-3/+3
|\ \ | |/ |/| Fix docs for `chunk_size` parameter
| * Fix docs for `chunk_size` parameteradw1n2018-09-031-3/+3
|/ | | | | | Closes #2122 Signed-off-by: Przemysław Adamek <adw1n@users.noreply.github.com>
* Add RollbackConfig to API docsJoffrey F2018-08-091-0/+1
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Misc release script improvementsJoffrey F2018-08-091-7/+15
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Bump dev versionJoffrey F2018-08-091-1/+1
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge branch 'release'Joffrey F2018-08-092-1/+40
|\ | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
View Lorry Controller Status