summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update test dependencies to latest version, fix some flake8 errorsfix_test_depsJoffrey F2019-01-096-14/+15
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #2213 from docker/2210-swarm-init-returnJoffrey F2018-12-281-0/+1
|\ | | | | Make swarm.init() return value match documentation
| * Make swarm.init() return value match documentation2210-swarm-init-returnJoffrey F2018-12-281-0/+1
|/ | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #2207 from BoboTiG/patch-1Joffrey F2018-12-281-1/+1
|\ | | | | Fix DeprecationWarning: invalid escape sequence in services.py
| * Fix DeprecationWarning: invalid escape sequence in services.pyMickaël Schoentgen2018-12-201-1/+1
| | | | | | | | Signed-off-by: Mickaël Schoentgen <contact@tiger-222.fr>
* | Merge pull request #2208 from BoboTiG/patch-2Joffrey F2018-12-281-3/+3
|\ \ | |/ |/| Fix DeprecationWarning: invalid escape sequence in ports.py
| * Fix DeprecationWarning: invalid escape sequence in ports.pyMickaël Schoentgen2018-12-201-3/+3
|/ | | | Signed-off-by: Mickaël Schoentgen <contact@tiger-222.fr>
* Merge pull request #2204 from MaxBischoff/typo-fixJoffrey F2018-12-141-1/+1
|\ | | | | Fixed a typo in the configs api doc
| * Fixed a typo in the configs api docMaximilian Bischoff2018-12-141-1/+1
|/ | | | | | | The documentation for id in ConfigApiMixin inspect_config was wrongly mentioning removal of a config Signed-off-by: Maximilian Bischoff <maximilianbischoff2@gmail.com>
* Merge pull request #2197 from docker/2185-placement-prefsJoffrey F2018-12-115-16/+49
|\ | | | | Improve handling of placement preferences and associated docs
| * Dynamically retrieve version information for generated docs2185-placement-prefsJoffrey F2018-12-071-3/+5
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * Improve handling of placement preferences; improve docsJoffrey F2018-12-074-13/+44
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #2198 from docker/update_versionmapJoffrey F2018-12-111-2/+5
|\ \ | |/ |/| Update Jenkinsfile version map
| * Update Jenkinsfile version mapupdate_versionmapJoffrey F2018-12-071-2/+5
|/ | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #2196 from docker/2194-clean-releaseJoffrey F2018-12-071-2/+3
|\ | | | | Prevent untracked files in releases
| * Prevent untracked files in releases2194-clean-releaseJoffrey F2018-12-071-2/+3
|/ | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #2193 from docker/update_setup_pyJoffrey F2018-11-302-15/+12
|\ | | | | Update setup.py for modern pypi / setuptools
| * Update setup.py for modern pypi / setuptoolsupdate_setup_pyJoffrey F2018-11-302-15/+12
|/ | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #2192 from docker/authconfig_fixJoffrey F2018-11-303-4/+10
|\ | | | | Fix empty authconfig detection
| * Fix empty authconfig detectionauthconfig_fixJoffrey F2018-11-303-4/+10
|/ | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #2188 from docker/c6374-credhelpersJoffrey F2018-11-309-286/+530
|\ | | | | Modernize auth management
| * Add some credHelpers testsc6374-credhelpersJoffrey F2018-11-302-52/+231
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * Add credstore_env to all load_config callsJoffrey F2018-11-302-3/+7
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * Make AuthConfig a dict subclass for backward-compatibilityJoffrey F2018-11-302-9/+13
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * Modernize auth managementJoffrey F2018-11-288-237/+294
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge branch 'little-dude-master'Joffrey F2018-11-3013-69/+371
|\ \
| * | Move exec_run example to user guides section of docsJoffrey F2018-11-305-64/+79
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | Fix test namesJoffrey F2018-11-301-25/+28
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | Merge branch 'master' of https://github.com/little-dude/docker-py into ↵Joffrey F2018-11-309-56/+340
| |\ \ |/ / / | | | | | | little-dude-master
| * | fix exec api inconsistencyCorentin Henry2018-11-283-5/+11
| | | | | | | | | | | | Signed-off-by: Corentin Henry <corentinhenry@gmail.com>
| * | fix exec_start() documentationCorentin Henry2018-11-281-2/+2
| | | | | | | | | | | | Signed-off-by: Corentin Henry <corentinhenry@gmail.com>
| * | tests various exec_create/exec_start combinationsCorentin Henry2018-11-281-0/+69
| | | | | | | | | | | | | | | | | | Test the interation of the tty, demux and stream parameters Signed-off-by: Corentin Henry <corentinhenry@gmail.com>
| * | add tests for _read_from_socketCorentin Henry2018-11-282-23/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check that the return value against the various combination of parameters this function can take (tty, stream, and demux). This commit also fixes a bug that the tests uncovered a bug in consume_socket_output. Signed-off-by: Corentin Henry <corentinhenry@gmail.com>
| * | implement stream demultiplexing for exec commandsCorentin Henry2018-11-279-40/+181
| | | | | | | | | | | | | | | | | | fixes https://github.com/docker/docker-py/issues/1952 Signed-off-by: Corentin Henry <corentinhenry@gmail.com>
* | | Merge pull request #2181 from funkyfuture/exec_run_docsJoffrey F2018-11-301-2/+2
|\ \ \ | |_|/ |/| | Fixes the documented return value of models.containers.Container.exec_run
| * | Fixes return value models.containers.Container.exec_run.__doc__Frank Sachsenheim2018-11-271-2/+2
| | | | | | | | | | | | Signed-off-by: Frank Sachsenheim <funkyfuture@riseup.net>
* | | Next dev versionJoffrey F2018-11-281-1/+1
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | Merge branch 'release'Joffrey F2018-11-282-2/+39
|\ \ \
| * \ \ Merge pull request #2187 from docker/3.6.0-release3.6.0Joffrey F2018-11-2836-186/+643
| |\ \ \ | | | | | | | | | | 3.6.0 release
| | * | | Release 3.6.03.6.0-releaseJoffrey F2018-11-282-1/+26
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| | * | | Update DockerClient.images.pull to always stream responseJoffrey 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>
| | * | | Correctly handle longpath prefix in process_dockerfile when joining pathsJoffrey F2018-11-283-2/+72
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| | * | | tests: bump pytest-timeoutCorentin Henry2018-11-281-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-281-12/+12
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Corentin Henry <corentinhenry@gmail.com>
| | * | | Fix versions script to accept versions without -ce suffixJoffrey F2018-11-281-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| | * | | Fix file mode in image.save examplesJoffrey F2018-11-282-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| | * | | Add doc example for get_archiveJoffrey F2018-11-282-0/+23
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| | * | | Properly convert non-string filters to expected string formatJoffrey F2018-11-282-3/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| | * | | Disallow incompatible combination stats(decode=True, stream=False)Joffrey F2018-11-282-2/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
View Lorry Controller Status