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

3199 Commits

Author SHA1 Message Date
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
shin- a0fa5c0a52 Merge branch 'paultag-paultag/feature/events' 2013-11-11 17:16:38 +01:00
Joffrey F 2dd409aa8b Merge pull request #93 from atbaker/Readme_fix 
Adds missing comma in start ports dict
 2013-11-11 08:15:26 -08:00
Peter Yu a70af55c22 logs now follows the new stream format 2013-11-10 03:33:42 +00:00
Peter Yu 6c2820835e many tests have been implemented 2013-11-10 02:14:53 +00:00
Peter Yu 97771b1b2b links implemented. use v1.6 by default now 2013-11-10 00:27:10 +00:00
Andrew T. Baker 7bbeca8b9f Adds missing comma in start ports dict 2013-11-09 15:36:35 -05:00
Jessica Gadling 70a5c9b0ca Support the new PublishAllPorts flag. 2013-11-08 21:07:18 -08:00
Maxime Petazzoni a451119e4a Allow for configurable timeout on all client requests 
Signed-off-by: Maxime Petazzoni <max@signalfuse.com>
 2013-11-08 15:19:51 -08:00
yukw777 fdd48cff81 pull, push, build are streamable 2013-11-08 21:08:46 +00:00
shin- 1345da7972 Avoid an additional level of indentation 2013-11-08 20:43:50 +01:00
shin- 2e66ca8a6c assertIn not supported in py26 2013-11-08 20:43:09 +01:00
shin- 1d1395464c Merge branch 'auth-load-config-fix' of github.com:mpetazzoni/docker-py into mpetazzoni-auth-load-config-fix 2013-11-08 20:38:01 +01:00
shin- e206594014 Merged + events should support JSON data of any size 2013-11-08 20:34:59 +01:00
yukw777 e0df0c7ad2 pull, push, build are streamable 2013-11-08 19:22:23 +00:00
shin- 8309ae7896 Added unit test for named containers 2013-11-08 19:34:30 +01:00
shin- 78667c19a8 Merge branch 'named-container-create' of github.com:mpetazzoni/docker-py into mpetazzoni-named-container-create 2013-11-08 19:28:35 +01:00
shin- 287032cf0e Don't import websocket-client if environment is python 3 (not supported) 2013-11-08 19:10:41 +01:00
shin- 0901b28957 Merge branch 'attach-websocket' of github.com:aanand/docker-py into aanand-attach-websocket 
Conflicts:
	docker/client.py
 2013-11-08 19:03:43 +01:00
shin- f6159b5593 Fixed lxc_conf param in Client.start to accept dict configurations. Fixes #84 2013-11-08 18:58:10 +01:00
Maxime Petazzoni 9871f8d9ac Don't fail loading the configuration when .dockercfg doesn't exist 
Signed-off-by: Maxime Petazzoni <max@signalfuse.com>
 2013-11-07 15:38:53 -08:00
Maxime Petazzoni afb349d257 Add integration test for named container creation 
Signed-off-by: Maxime Petazzoni <max@signalfuse.com>
 2013-11-07 15:37:41 -08:00
Joffrey F 4b8938ae24 Merge pull request #81 from ureyes84/start_lxc_conf_doc 
Added example to the lxc_conf argument in the start command
 2013-11-07 07:54:25 -08:00
Ulises Reyes 674fe91451 Added example to the lxc_conf argument in the start command 2013-11-06 21:23:35 -05:00
Maxime Petazzoni f344d8e65f Support naming containers when creating them 
Add support for passing in the name parameter to the call to
/containers/create to name the created container (API v1.6 feature).

Signed-off-by: Maxime Petazzoni <max@signalfuse.com>
 2013-11-06 17:02:38 -08:00
Aanand Prasad bd938b5879 Use websockets by passing 'ws' param to attach_socket 2013-11-06 17:33:37 +00:00
Paul Tagliamonte 9a98e7fc8c Add events endpoint to the Client 
This is a bit of a hack; I added a method (and did a slight refactor of
 the old one) to handle getting the raw socket from the requests
 request. If the attach_sockets method isn't public, I'd suggest
 removing it entirely for a slightly more general one.

 This also needs some attention paid to validating legnth, and properly
 parsing the returned data by using the length.

Signed-off-by: Paul Tagliamonte <tag@pault.ag>
 2013-11-05 22:20:50 -05:00
Joffrey F 3aa51d52d0 Merge pull request #76 from rca/port_bindings 
Port bindings
 2013-11-05 10:11:39 -08:00
Roberto Aguilar f62cee4451 Updated README to include /tcp in port binding doc 2013-11-04 15:03:06 -08:00
Roberto Aguilar 6047c581df Updated README 2013-11-04 14:45:13 -08:00
Roberto Aguilar 5d6bf51b4f Added Docker 0.6.5 ports compatibility 2013-11-04 14:12:30 -08:00
shin- 28b262337a Bumped version to 0.2.2 2013-10-24 18:36:37 +02:00
shin- 41750ea172 Merged 2013-10-23 20:04:15 +02:00