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

281 Commits

Author SHA1 Message Date
Ulises Reyes f5924c3863 Updated the port function in order to parse the new NetworkSettings Port dict (fixes #88) 2013-12-14 22:00:08 -05:00
shin- 5c928dcab5 Fixed start_container_with_port_binds test 2013-12-13 15:47:24 +01:00
shin- 64781888e0 Merge branch 'privilege' of github.com:yukw777/docker-py into yukw777-privilege 
Conflicts:
	README.md
	tests/test.py
 2013-12-13 15:46:54 +01:00
shin- 9bbbb5d3b4 Fixed indentation 2013-12-13 15:27:00 +01:00
Maxime Petazzoni 4bc4ee3cf0 Log streaming and correct decoding of multiplexed log streams 
Implement log streaming with the stream parameter on logs(), returning a
generator of log lines based on the selected streams (stdout/stderr).
Also correctly decode the multiplexed log streams (current version was
buggy).

Signed-off-by: Maxime Petazzoni <max@signalfuse.com>
 2013-12-12 22:26:17 -08:00
shin- 5e68ed1df8 Updated changelog, bumped version in setup.py 2013-12-10 19:53:58 +01:00
Joffrey F 08d6de7ca1 Merge pull request #115 from dotcloud/port_volumes 
Simplified port bindings and volume mapping
 2013-12-09 09:10:26 -08:00
shin- 89f2c58918 Improved port binding conversion rules, fixed bugs, added unit tests 2013-12-09 17:45:12 +01:00
Joffrey F 4fde1a242e Merge pull request #117 from mpetazzoni/fix-streaming 
Fix _stream_helper
 2013-12-09 07:20:36 -08:00
Maxime Petazzoni c60c0d24a9 Fix _stream_helper 
The stream helper that yields the streamed status for push, pull and
build operations was reading data in chunks of 4096 bytes but didn't
support buffering and thus didn't behave well when more than 4096 bytes
were received at once from the socket.

This implementation uses makefile() to get a file object from the socket
on which we can use readline() so we can read line by line the
chunked-encoding data streamed to us by the Docker daemon.

Signed-off-by: Maxime Petazzoni <max@signalfuse.com>
 2013-12-06 16:44:47 -08:00
shin- ef615f5549 Flake8 fix 2013-12-06 21:05:59 +01:00
shin- e00a7e986a Simplified port bindings and volume mapping 2013-12-06 21:00:44 +01:00
Peter Yu 26f6f2bc40 rebased and updated the README 2013-12-06 15:31:15 +00:00
Joris van de Donk 7ae66d5ff4 Update README.md 
Derp. Removed extra space.
 2013-12-06 15:31:15 +00:00
Joris van de Donk ed45f1fd1b Fix readme.md documentation for the 'volume' arg in create_container 
Correct syntax is volumes={"/some/mount/point": {}}, not volumes={"/some/mount/point": ""}.
 2013-12-06 15:31:15 +00:00
Fernando 0cb2ce8126 fix auth ping to https 2013-12-06 15:31:15 +00:00
Maxime Petazzoni f6b345e19c Correctly pass the response parameter to the HTTPError constructor 
Signed-off-by: Maxime Petazzoni <max@signalfuse.com>
 2013-12-06 15:31:15 +00:00
Maxime Petazzoni 1a83e31d05 Fix under-indented line 
Signed-off-by: Maxime Petazzoni <max@signalfuse.com>
 2013-12-06 15:31:15 +00:00
Maxime Petazzoni 4c4bd95429 Ensure sorted order on links to make unit test deterministic 
Signed-off-by: Maxime Petazzoni <max@signalfuse.com>
 2013-12-06 15:31:15 +00:00
Maxime Petazzoni db12b61b4d Restore disabling timeout on image pull 
Signed-off-by: Maxime Petazzoni <max@signalfuse.com>
 2013-12-06 15:30:29 +00:00
Joffrey F a60c1cd3a8 Merge pull request #113 from jorisvddonk/patch-1 
Fix readme.md documentation for the 'volume' arg in create_container
 2013-12-05 05:11:34 -08:00
Joris van de Donk ede504d85f Update README.md 
Derp. Removed extra space.
 2013-12-04 22:04:25 +01:00
Joris van de Donk 5e13a9f0ef Fix readme.md documentation for the 'volume' arg in create_container 
Correct syntax is volumes={"/some/mount/point": {}}, not volumes={"/some/mount/point": ""}.
 2013-12-04 21:57:25 +01:00
Joffrey F f247844278 Merge pull request #100 from mpetazzoni/pull-timeout 
Restore disabling timeout on image pull
 2013-12-02 07:06:08 -08:00
Joffrey F 91290de38c Merge pull request #107 from mpetazzoni/fix-apierror-response-message 
Correctly pass the response parameter to the HTTPError constructor
 2013-12-02 07:00:52 -08:00
Joffrey F 732b69be2e Merge pull request #110 from tutumcloud/fix_auth_ping 
Fix bug when checking HTTPS connection to private registries
 2013-12-02 06:58:06 -08:00
Fernando be72e28f65 fix auth ping to https 2013-11-28 01:49:36 -03:00
Maxime Petazzoni 95b12808fc Correctly pass the response parameter to the HTTPError constructor 
Signed-off-by: Maxime Petazzoni <max@signalfuse.com>
 2013-11-20 14:42:26 -08:00
Maxime Petazzoni 058c2798cc Fix under-indented line 
Signed-off-by: Maxime Petazzoni <max@signalfuse.com>
 2013-11-19 13:40:03 -08:00
Maxime Petazzoni 8c4c7c3d49 Ensure sorted order on links to make unit test deterministic 
Signed-off-by: Maxime Petazzoni <max@signalfuse.com>
 2013-11-19 13:37:03 -08:00
Peter Yu e361f4c1cd Privileged option is part of host config, not config 2013-11-18 21:47:33 +00:00
Maxime Petazzoni 7a3564a746 Restore disabling timeout on image pull 
Signed-off-by: Maxime Petazzoni <max@signalfuse.com>
 2013-11-15 14:56:17 -08:00
shin- 35d3a3c977 Merge branch 'timeout-support' of github.com:mpetazzoni/docker-py into mpetazzoni-timeout-support 
Conflicts:
	docker/client.py
	tests/integration_test.py
	tests/test.py
 2013-11-15 21:44:18 +01:00
shin- e694d5af3e Merge branch 'v65-2' of github.com:yukw777/docker-py into yukw777-v65-2 
Fixed some tests

Conflicts:
	docker/client.py
	tests/fake_api.py
	tests/integration_test.py
	tests/test.py
 2013-11-15 19:53:10 +01:00
shin- c0f84ceac0 Fix privileged test 2013-11-15 19:06:19 +01:00
shin- 34df4e5343 Fixed auth stuff for Python 3 2013-11-15 18:38:09 +01:00
shin- 2828833607 Merge branch 'master' of github.com:dotcloud/docker-py into yukw777-link 
Fixed test_pull and test_pull_stream (don't assume headers content is empty)

Conflicts:
	tests/test.py
 2013-11-15 18:21:49 +01:00
Joffrey F 6f293f2a2c Merge pull request #98 from dangra/kill-signal 
Add signal argument to kill command
 2013-11-15 09:06:41 -08:00
Maxime Petazzoni 6b3afdcef3 Smarter request timeout for stopping a container 
Signed-off-by: Maxime Petazzoni <max@signalfuse.com>
 2013-11-14 15:45:19 -08:00
Daniel Graña 8561544e30 Add signal argument to kill command 2013-11-14 10:43:57 -02:00
Maxime Petazzoni 0537f3cc80 Disable timeout on image pulls 
Signed-off-by: Maxime Petazzoni <max@signalfuse.com>
 2013-11-13 21:41:55 -08:00
Peter Yu 90d13d5fd2 links implemented. use v1.6 by default now 2013-11-12 16:09:29 +00:00
Maxime Petazzoni cc3c455629 Refactor timeout passing and standardize with keyword parameters 
Standardize all HTTP request calls to use keyword parameters for all but
the URL. This makes the refactoring of including the timeout in these
requests' parameters easier and more uniform-looking. Tweaks to the
tests to comply with this new parameter passing scheme, in particular to
the API calls assertions.

Signed-off-by: Maxime Petazzoni <max@signalfuse.com>
 2013-11-11 14:02:49 -08:00
shin- 14946ed56b Small test fix 2013-11-11 20:46:50 +01:00
shin- cc67a530d0 Client.logs should work with version < 1.6 2013-11-11 20:43:08 +01:00
shin- 0158adcdd9 Merge branch 'log-fix' of github.com:yukw777/docker-py into yukw777-log-fix 2013-11-11 20:39:31 +01:00
shin- 5b766fc33d Merge branch 'master' of github.com:dotcloud/docker-py 2013-11-11 20:25:41 +01:00
shin- ce0fbd1122 Unify socket helpers + naming conventions 2013-11-11 20:20:00 +01:00
shin- 4f6f475fd5 Merge branch 'stream-pull-request' of github.com:yukw777/docker-py into yukw777-stream-pull-request 2013-11-11 19:48:52 +01:00
Joffrey F ca2d0c6204 Merge pull request #90 from treylane/add-publish-all-ports 
Support the new PublishAllPorts flag.
 2013-11-11 08:19:11 -08:00