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

980 Commits

Author SHA1 Message Date
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
Joffrey F 5ca2419e23 Updated changelog 2015-03-10 17:29:24 -07:00
Joffrey F 0c8626ebea Fixed TLS docs 2015-03-10 17:14:51 -07:00
Joffrey F dc16b56c4b Merge pull request #520 from kenden/master 
Making examples in doc a bit clearer for volumes and ports_binding
 2015-03-09 10:34:21 -07:00
kenden 9bf3efb90b adding response container_id to make the example clearer. 
Without it, c.start refer to container_id, which has not been introduced before.
 2015-03-09 15:44:24 +01:00
kenden 144f11d4e0 adding response container_id to make the example clearer. 
Without this, c.start refers to container_id, which has not been introduced before
 2015-03-09 15:43:13 +01:00
Joffrey F 6fac5fd47c Merge pull request #519 from TomasTomecek/document-tail-in-logs 
docs: document parameter tail of method logs
 2015-03-06 12:12:04 -08:00
Tomas Tomecek 05bbafee03 docs: document parameter tail of method logs 2015-03-06 10:06:42 +01:00
Joffrey F 7d5c1efbbe Fix unit tests 2015-03-05 12:16:53 -08:00
Joffrey F 7c4ed86d8d Merge branch 'TomasTomecek-autodetect-api-version' 2015-03-05 12:12:27 -08:00
Joffrey F 6f18b4a86f Mention version='auto' in docs 2015-03-05 12:12:02 -08:00
Joffrey F acfa99dd10 Auto-detect integration tests 2015-03-05 12:08:41 -08:00
Joffrey F bd46ba5757 Don't allow 'version' param in AutoVersionClient ctor 2015-03-05 12:08:16 -08:00
Joffrey F 2ec104792b Streamline exceptions for auto version ; retrieve_server_version into protected method 2015-03-05 11:52:47 -08:00
Tomas Tomecek 3e0496cc16 detect server version when version="auto" 
heavily inspired by PR#281

Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
 2015-03-05 08:53:29 +01:00
Joffrey F 9bed480c27 Bump requests version 2015-03-04 16:29:44 -08:00
Joffrey F 55571308e8 Merge branch 'master' of github.com:docker/docker-py 2015-03-04 13:38:05 -08:00
Joffrey F a043173676 Merge branch 'ssanderson-py3-json' 2015-03-04 13:37:50 -08:00
Joffrey F dc210b865e Only call decode if Python 3.x 2015-03-04 13:37:34 -08:00
Joffrey F 7e600a3fe7 Merge branch 'py3-json' of https://github.com/ssanderson/docker-py into ssanderson-py3-json 2015-03-04 13:35:35 -08:00
Joffrey F 1aee1df4dd Merge pull request #511 from rmohr/fix-open-files 
Properly close files and sockets in unit tests
 2015-03-04 13:34:20 -08:00
Joffrey F 134e4b712c Merge pull request #514 from dlorenc/master 
Handle passwords with ':' characters.
 2015-03-03 15:19:48 -08:00
dlorenc c4cb509277 Handle passwords with ':' characters. 
Signed-off-by: dlorenc <lorenc.d@gmail.com>
 2015-03-03 14:51:35 -08:00
Roman Mohr a86bfffd89 Properly close files and sockets in unit tests 2015-02-28 21:03:15 +01:00
Joffrey F 39ee5981b4 Merge pull request #502 from cpuguy83/498_dockerignore_special_names 
Add special cases for .dockerignore
 2015-02-27 11:56:19 -08:00
Joffrey F 91985b2397 Merge pull request #509 from docker/lxc_driver_test_compat 
Lxc driver test compat
 2015-02-27 11:48:36 -08:00
Joffrey F 0fae821350 Merge pull request #508 from docker/de-i11003 
Rename test fix to take into account docker/docker#11003
 2015-02-27 11:47:57 -08:00
Joffrey F a341aa2d26 Merge branch 'aanand-fix-resolve-authconfig' 2015-02-27 11:45:21 -08:00
Joffrey F 86390888d8 shorter convert_to_hostname 2015-02-27 11:44:53 -08:00