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

3158 Commits

Author SHA1 Message Date
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
Joffrey F 4c16b752d0 Merge branch 'version_info' of https://github.com/terminalmage/docker-py into terminalmage-version_info 2015-04-22 11:11:11 -07:00
Joffrey F 0bb5ed5c24 Merge pull request #530 from dlorenc/master 
Add assert_fingerprint option.
 2015-04-22 11:10:03 -07:00
Joffrey F cf0537e183 Merge pull request #537 from onorua/master 
IPC sharing implementation
 2015-04-22 11:09:03 -07:00
Joffrey F 4267b9acf3 Merge pull request #544 from uvgroovy/master 
parse port ranges
 2015-04-22 11:07:21 -07:00
Johan Euphrosine 6582aad83b add MAINTAINERS 2015-04-21 10:48:32 -07:00
Yuval Kohavi baadad05ad removed unneeded imports 
Signed-off-by: Yuval Kohavi <yuval.kohavi@gmail.com>
 2015-04-17 17:09:45 -04:00
Yuval Kohavi 605fc7e04f line length 
Signed-off-by: Yuval Kohavi <yuval.kohavi@gmail.com>
 2015-04-11 07:20:43 -05:00
Yuval Kohavi b33052b393 python 2.6 compatible 
Signed-off-by: Yuval Kohavi <yuval.kohavi@gmail.com>
 2015-04-11 07:17:28 -05:00
Yuval Kohavi 8028c988ce added ports to setup.py 
Signed-off-by: Yuval Kohavi <yuval.kohavi@gmail.com>
 2015-04-08 11:00:25 +03:00
Erik Johnson 99e1ee452e Add a version_info attribute 
This makes comparing docker-py versions *much* easier. Having to account
for the potential of a "-dev" suffix is a PITA.
 2015-04-03 17:24:02 -05:00
Yuval Kohavi 278e801b89 Adding port utils to split port ranges 
Signed-off-by: Yuval Kohavi <yuval.kohavi@gmail.com>
 2015-04-03 17:23:50 +03:00
Fábio C. Barrionuevo da Luz f588831a88 added URL for this project in setup configuration 2015-03-31 23:03:55 -03:00
Yaroslav Molochko 48a19c3129 IPC sharing implementation 2015-03-30 09:29:18 +03:00
Joffrey F 2f6579bf59 Use assertRaises in a backward compatible fashion 2015-03-25 16:07:16 -07:00
Joffrey F 6e0b5a8d70 Added assertIn shim for py2.6 2015-03-25 16:02:46 -07:00
Joffrey F ec85f126ed Merge branch 'ewindisch-secopt' 2015-03-25 15:40:38 -07:00
Joffrey F b097d19f2f docs and unit test for security_opt 2015-03-25 15:40:14 -07:00
Joffrey F 1845d3b13f Added some type and version checks; removed security_opt from container_config (as this is invalid) 2015-03-25 15:19:06 -07:00
Eric Windisch 24b0cab2dc Add security_opt for create/start 
Signed-off-by: Eric Windisch <eric@windisch.us>
 2015-03-24 17:07:53 -04:00
Joffrey F cf0199badf Merge pull request #533 from ynachiket/master 
Fixed stats related typo in api.md
 2015-03-21 21:09:18 -07:00
ynachiket 10f6eafb2b Fixed stats related typo in api.md 2015-03-21 10:37:44 -07:00
Joffrey F 70ce156e26 Merge branch 'master' of github.com:docker/docker-py 2015-03-20 16:17:38 -07:00
Joffrey F adf5a1cfc6 Use get instead of bracket notation 2015-03-20 16:17:15 -07:00
Joffrey F c0df903af1 Merge branch 'fix-port-host-net' of https://github.com/ssanderson/docker-py into ssanderson-fix-port-host-net 2015-03-20 15:58:30 -07:00
Joffrey F 96440cccb0 Merge pull request #531 from josephpage/dockerignore-eof-windows 
Windows : fix EOL of .dockerignore file
 2015-03-20 15:56:50 -07:00
Joffrey F 0e8fc634b2 Merge pull request #532 from aanand/labels 
Labels
 2015-03-20 15:56:20 -07:00
Joffrey F 645c84e65d Back to dev version 2015-03-20 15:56:04 -07:00
Aanand Prasad bd72bd13c7 Finish labels implementation, add tests and docs 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-20 15:42:10 -07:00
Aanand Prasad 014dba2841 Update default API version to 1.18 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-20 14:49:42 -07:00
Joseph Page 3804bcb8cc Windows : str.splitlines instead of str.split 
To be able to read `.dockerignore` file edited on Windows, python-py may use the multi-platform split function `str.splitlines()`

Ref : https://docs.python.org/2/library/stdtypes.html#str.splitlines
 2015-03-20 18:55:42 +01:00
dlorenc 47f3ff1679 Add assert_fingerprint option. 
Signed-off-by: dlorenc <lorenc.d@gmail.com>
 2015-03-19 11:43:05 -07:00
André Martins d018e37229 Implemented labels for docker-py 
Signed-off-by: André Martins <martins@noironetworks.com>
 2015-03-17 18:52:25 +00:00
Scott Sanderson 7fae65b745 MAINT: Don't re-index multiple times. 2015-03-16 15:28:56 -04:00
Scott Sanderson 851f2b82f5 BUG: Don't barf on Client.port when no port settings provided. 2015-03-16 15:27:04 -04:00
Joffrey F 01654eee68 Merge pull request #523 from docker/1.1.0-release 
1.1.0 release
 2015-03-11 11:33:14 -07:00
Joffrey F 15631d352c Bumped version 2015-03-10 17:29:33 -07:00