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

1144 Commits

Author SHA1 Message Date
Joffrey F aceb7a69b5 Merge pull request #572 from dlorenc/master 
Change decorators to use a relative import.
 2015-04-28 10:08:09 -07:00
Joffrey F d74d38cf23 Back to dev version 2015-04-28 10:07:07 -07:00
dlorenc a7b2a1bff3 Change decorators to use a relative import. 
This is more consistent with the way the rest of the package
imports errors. This also solves a crazy cyclical import issue
I'm seeing.

Signed-off-by: dlorenc <lorenc.d@gmail.com>
 2015-04-27 18:57:48 -07:00
Joffrey F 85c0c3b0e3 Merge pull request #571 from docker/1.2.0-release 
Release 1.2.0
 2015-04-27 17:45:01 -07:00
Joffrey F 652e5b8bda Added 'label' to list of filters 2015-04-27 17:41:52 -07:00
Joffrey F 5b9d088e65 Updated ChangeLog 2015-04-27 17:39:21 -07:00
Joffrey F 0f30ee06cb Bumped version 2015-04-27 17:39:21 -07:00
Joffrey F e2fef06bbc Merge pull request #570 from docker/build_limits 
Build limits
 2015-04-27 16:52:19 -07:00
Joffrey F 8c32677725 container limits documentation 2015-04-27 16:50:00 -07:00
Joffrey F 7958110fda Added unit tests for container limits in build 2015-04-27 16:36:15 -07:00
Joffrey F ae329cb3ac * Separate file to store constants 
* Added container_limits param to Client.build
 2015-04-27 16:24:42 -07:00
Joffrey F 2eadd58bcd Merge pull request #569 from docker/docs_filters 
Improved filters documentation
 2015-04-27 16:15:36 -07:00
Joffrey F eeb4d4a3a6 Improved filters documentation 2015-04-27 14:39:25 -07:00
Joffrey F 5eeb61a1e5 Merge pull request #568 from docker/exec_rework 
Exec API rework
 2015-04-27 14:32:55 -07:00
Joffrey F e337a2317e Updated exec API documentation 2015-04-27 14:11:43 -07:00
Joffrey F e2ad91bdf7 Exec API tests 2015-04-27 13:57:15 -07:00
Joffrey F 0fd70b47e3 Properly implement exec API 2015-04-27 12:36:18 -07:00
Joffrey F 2b153a63c8 Merge pull request #564 from docker/check_resource_not_none 
Added check_resource decorator
 2015-04-27 11:29:05 -07:00
Joffrey F 8d3dedf072 Merge pull request #566 from pahaz/patch-1 
fix(client.py): unification the container argument for commit
 2015-04-27 11:28:41 -07:00
Joffrey F 019751daa8 Use custom Error class (inherits DockerException and ValueError) 2015-04-27 11:26:45 -07:00
Pahaz Blinov 1e41b67226 fix(client.py): unification the container argument 2015-04-26 09:24:22 +05:00
Joffrey F c2d48652ce Added check_resource decorator to interrupt command if container or image argument is None 2015-04-24 15:56:35 -07:00
Joffrey F 185fceda7b Merge pull request #563 from docker/logconfig-support 
Logconfig support
 2015-04-24 15:22:29 -07:00
Joffrey F 53cfe633db v2 doesn't have a /_ping endpoint, use /v2/ instead. Fixes #549 2015-04-24 15:21:17 -07:00
Joffrey F c7948436e5 Added tests for log_config param 2015-04-24 15:10:51 -07:00
Joffrey F 21d80b16dd Added log_config support in host config 2015-04-24 14:56:06 -07:00
Joffrey F 8316fa4e03 Merge pull request #555 from docker/client_side_trunc 
Handle ID truncate on client side in containers list
 2015-04-22 18:02:59 -07:00
Joffrey F 6228929a88 Handle ID truncate on client side in containers list (and changed default from True to False) 2015-04-22 18:00:53 -07:00
Joffrey F 7e7d8ee7ac Merge branch 'client_side_trunc' 2015-04-22 17:46:14 -07:00
Joffrey F c328be7deb revert 2015-04-22 17:45:56 -07:00
Joffrey F d0a49ec3b8 Added integration test 2015-04-22 17:43:36 -07:00
Joffrey F 01e7d97537 Merge pull request #554 from docker/ulimit_support 
ulimits support
 2015-04-22 17:04:44 -07:00
Joffrey F 650abccd7e ulimits: Updated docs 2015-04-22 16:44:40 -07:00
Joffrey F d71bfb1b3d Improved ulimit tests 2015-04-22 15:45:49 -07:00
Joffrey F d87577c7c6 improved Ulimit class 2015-04-22 15:45:38 -07:00
Joffrey F 803b37bc2e assertRaises 2.6 compat 2015-04-22 15:19:01 -07:00
Joffrey F 84fdd2925d Add tests for ulimits 2015-04-22 15:13:38 -07:00
Joffrey F 857614fb1a Add support for ulimits in host_config 2015-04-22 15:13:25 -07:00
Joffrey F c7511481a6 BaseTestCase shims assertIn 2015-04-22 15:11:55 -07:00
Joffrey F 5b69cbf4ef Merge pull request #551 from docker/support_v2_private_registry 
Modify expand_registry_url to support v2 private registries.
 2015-04-22 14:10:28 -07:00
Joffrey F b46e4a398b Modify expand_registry_url to support v2 private registries. 2015-04-22 13:56:35 -07:00
Joffrey F 6dd45d7535 Merge branch 'ssssam-sam/import-improvements' 2015-04-22 11:55:00 -07:00
Joffrey F a5519022d9 Merge branch 'sam/import-improvements' of https://github.com/ssssam/docker-py into ssssam-sam/import-improvements 
Conflicts:
	docker/client.py
	docker/unixconn/unixconn.py
	tests/integration_test.py
 2015-04-22 11:50:45 -07:00
Joffrey F 05ddf093db Merge branch 'hibooboo2-pull_auth' 2015-04-22 11:30:00 -07:00
Joffrey F e1a6f2e0ff Small docs clarification 2015-04-22 11:28:59 -07:00
Joffrey F 1445956010 Merge branch 'pull_auth' of https://github.com/hibooboo2/docker-py into hibooboo2-pull_auth 2015-04-22 11:18:46 -07:00
Joffrey F 9b84e11ae4 Merge branch 'luzfcb-patch-1' 2015-04-22 11:16:59 -07:00
Joffrey F ee096c867f Merge branch 'patch-1' of https://github.com/luzfcb/docker-py into luzfcb-patch-1 
Conflicts:
	setup.py
 2015-04-22 11:16:44 -07:00
Joffrey F b2c8b797fe Merge branch 'terminalmage-version_info' 2015-04-22 11:14:49 -07:00
Joffrey F cab86bb170 Automatically generate version_info from version string 2015-04-22 11:14:32 -07:00