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

172 Commits

Author SHA1 Message Date
Ben Firshman 4bc5d27e51 Add working_dir option to create_container 2014-01-19 16:41:40 +00:00
Ben Firshman ab2f7a5e38 Add cpu_shares option to create_container 2014-01-19 16:41:25 +00:00
Ben Firshman 8e8b355acd Add entrypoint option to create_container 2014-01-19 16:41:08 +00:00
shin- 477831334c Merge branch 'master' of git://github.com/dotcloud/docker-py 2014-01-16 20:26:06 +01:00
shin- 8a5cd6ae65 Merge branch 'feature/image-import' of github.com:tarnfeld/docker-py into tarnfeld-feature/image-import 2014-01-16 20:22:33 +01:00
Joffrey F 4bf75ded43 Merge pull request #119 from ureyes84/master 
Updated port function
 2014-01-16 11:19:34 -08:00
Maxime Petazzoni dad95ba679 Default to /tcp for port definitions in create_container() 
Fixes #141.

Signed-off-by: Maxime Petazzoni <max@signalfuse.com>
 2014-01-16 10:23:02 -08:00
Maxime Petazzoni 32ad01e110 Rework auth config loading and use of auth data for login/pull/push 
Signed-off-by: Maxime Petazzoni <max@signalfuse.com>
 2014-01-07 15:30:50 -08:00
Nada Amin d1427d38be Option to disable network when creating container. 2014-01-03 16:20:45 +00:00
Ulises Reyes d8e0f5a66f Improves code style 2013-12-15 20:42:58 -05:00
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
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- 89f2c58918 Improved port binding conversion rules, fixed bugs, added unit tests 2013-12-09 17:45:12 +01:00
Tom Arnfeld 50337f8628 Added failing test for importing an image via name instead of src 2013-12-06 23:00:28 +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 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
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- 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
Daniel Graña 8561544e30 Add signal argument to kill command 2013-11-14 10:43:57 -02: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- 5b766fc33d Merge branch 'master' of github.com:dotcloud/docker-py 2013-11-11 20:25:41 +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
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
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- 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
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- 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
shin- acd2607407 Flake8 compliance + flake8 tests in tox.ini 2013-10-15 21:15:01 +02:00
shin- 0808905636 Refactoring, Python 3 compatibility, Tests working with python 3, cleaned up imports. 2013-10-15 19:19:20 +02:00
Deni Bertovic 128cdb9112 fixed test list_containers to account for upstream changes 2013-10-03 11:56:44 +02:00
Deni Bertovic 1ce8dc962c python3 fixes 
Fixed imports to be compatible with python3 on various places in the client lib
and in the tests themselves.
 2013-10-03 11:55:02 +02:00
Deni Bertovic 7c80127eb7 refactored tests 
Using the mock library. Checking that every Client method gets
tested for not raising an Exception and for construting the request
params correctly.
 2013-10-03 11:51:12 +02:00
Deni Bertovic 80e11964f1 initial import of unit test and mocks for the docker api 2013-10-03 11:51:12 +02:00
Deni Bertovic 8047fb4cb4 reamed test.py to integration_test.py 2013-10-03 11:51:12 +02:00
shin- e2e5b9e0fd Merge branch 'master' into 0.2.0-dev 2013-09-12 00:00:06 +02:00
shin- c8e5a6dab1 Methods that previously supported multi-args are now single-argument. Doc and tests updated accordingly. 2013-09-11 23:44:58 +02:00
shin- c132d2b70d Fixed tests 2013-09-11 21:20:42 +02:00
shin- 9a92d68cf1 Merge branch 'better-error-reporting' of git://github.com/aanand/docker-py into 0.2.0-dev 
Conflicts:
	docker/__init__.py
	docker/client.py
 2013-09-11 21:14:42 +02:00
shin- 208fb0366f Use pseudo-constant for index URL 2013-09-10 20:38:14 +02:00
shin- 26933543fe Added license header to .py files 2013-09-10 20:34:03 +02:00
shin- 99c9eadc82 Cleanup, externalized into modules, fixed auth 2013-09-10 20:31:03 +02:00
Deni Bertovic f032ecfe47 Fixed #33 - make client commands more consistent 2013-09-04 15:53:37 +02:00
Evan Hazlett ea087b7b15 added privileged container support 2013-08-30 09:35:09 -04:00
shin- c0d8b2ef09 Fixed tests 2013-08-28 18:39:26 +02:00
shin- 17a6994e43 Docker client now tries to load the auth config. This is necessary to use the push command if API version is >1.0 2013-08-06 19:57:20 +02:00
shin- 4f7872da87 Fixed tests 2013-07-25 20:18:38 +02:00
shin- 7e415dd234 Fixing failed merge 2013-07-15 19:04:24 +02:00
shin- 4488be3678 Fixed tests 2013-07-15 19:02:48 +02:00
Enrico cf47df1b3e Removed duplicated import. 2013-07-11 18:05:19 -03:00
Enrico a863acce87 Added ability to create binds when starting a container. 2013-07-11 17:54:36 -03:00
Enrico 2551105320 Merge branch 'upstream-master' into bind-mounts 
Conflicts:
	tests/test.py
 2013-07-05 16:23:37 -03:00
Enrico c2a145c2d8 Added ability to create binds when starting a container. 2013-07-05 15:25:52 -03:00
Joffrey F d03d4fb5ca Merge pull request #15 from elbaschid/add_python3_support 
Make docker-py compatible with python 3
 2013-07-05 10:31:24 -07:00
shin- 2c186304a8 Added test for Client.build 2013-07-05 19:04:38 +02:00
Sebastian Vetter 48ed4a1d2e Add python 3 support 2013-07-06 00:32:28 +10:00
shin- b7e1ac7069 Fixed logs command 2013-07-03 22:19:41 +02:00
shin- e62bc3bd92 Small test fixes 2013-07-03 21:49:31 +02:00
shin- 66d22c9bba Tests for execution control, run commands as strings, commit/pull (still WIP) 2013-06-24 21:31:59 +02:00
shin- 3305949257 (WIP) Added unit tests 2013-06-21 19:59:36 +02:00