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

1046 Commits

Author SHA1 Message Date
Joffrey F ac90a874be Merge pull request #644 from docker/memory-memswap-hostconfig 
memory / memswap in hostconfig
 2015-06-30 15:06:32 -07:00
Maxime Petazzoni c8c957c983 Merge pull request #661 from docker/fix_640 
Added git@ as a valid prefix for remote build paths
 2015-06-30 14:40:11 -07:00
Joffrey F b959487117 Added git@ as a valid prefix for remote build paths 2015-06-30 03:00:10 +02:00
Joffrey F d300f5f323 Merge pull request #654 from Melraidin/master 
Prefer new Docker config location and format.
 2015-06-29 17:54:02 -07:00
Joffrey F 5375433058 Fix small decorator issue 2015-06-30 02:50:34 +02:00
Joffrey F 37fb963342 Merge branch 'posita-id-resolution-in-check-resource' 2015-06-30 01:49:33 +02:00
Joffrey F c2d98c204b Cleanup 2015-06-30 01:49:20 +02:00
Joffrey F 237ce20013 Merge branch 'id-resolution-in-check-resource' of https://github.com/posita/docker-py into posita-id-resolution-in-check-resource 2015-06-30 01:46:22 +02:00
Kevin Martin 6609586cc6 Prefer new Docker config location and format. 
This tries to load Docker authentication info from
~/.docker/config.json before falling back to its legacy location and
format at ~/.dockercfg.

Resolves https://github.com/docker/docker-py/issues/648
 2015-06-28 23:32:03 -04:00
Joffrey F 64dcd5a191 Merge pull request #653 from docker/fix_649 
Fix stop timeout bug
 2015-06-24 15:08:50 -07:00
Joffrey F 30fac5b879 Fix stop timeout bug 2015-06-24 22:58:56 +02:00
Aanand Prasad 772262fed0 Merge pull request #645 from docker/update-websocket-client-dep 
Update websocket client dependency
 2015-06-19 14:59:45 -07:00
Joffrey F ed94c0d525 Simplified tox config 2015-06-19 23:16:54 +02:00
Joffrey F 3170277347 Updated websocket-client dependency to latest version (now supports python 3) 2015-06-19 23:09:51 +02:00
Joffrey F f40e0342b2 Merge branch 'cesanta-master' 2015-06-19 22:42:58 +02:00
Joffrey F 8f43c03586 Support 401 status for v2 registry endpoint 2015-06-19 22:42:43 +02:00
Joffrey F d70aa1e45c Merge branch 'master' of https://github.com/cesanta/docker-py into cesanta-master 2015-06-19 22:36:23 +02:00
Joffrey F 7118b1fe5e Added Aanand (@aanand) as a maintainer 2015-06-19 02:59:35 +02:00
Joffrey F a12ba1a96f Updated tests for mem_limit changes 2015-06-19 02:13:12 +02:00
Joffrey F 427e3a6023 Moved mem_limit and memswap_limit to host_config for API version >= 1.19 2015-06-19 02:12:32 +02:00
Joffrey F e5485fb24f Merge branch 'glogiotatidis-pullfix' 2015-06-19 01:27:04 +02:00
Joffrey F cf06837002 Merge branch 'pullfix' of https://github.com/glogiotatidis/docker-py into glogiotatidis-pullfix 
Conflicts:
	docker/client.py
 2015-06-19 01:26:49 +02:00
Joffrey F ed07b053e9 Merge pull request #614 from ibuildthecloud/extra-host-list 
Allow extra_hosts to be a list too
 2015-06-18 12:30:21 -07:00
Joffrey F 54e48662a5 Merge pull request #609 from mattmoor/master 
Update docker-py to use a more portable sense of HOME.
 2015-06-18 12:29:08 -07:00
Joffrey F 414d90122f Merge branch 'ssanderson-use-wraps' 2015-06-18 21:25:01 +02:00
Joffrey F 7e1ce9473e Fixed import style 2015-06-18 21:24:49 +02:00
Joffrey F cd5c8c593a Merge branch 'use-wraps' of https://github.com/ssanderson/docker-py into ssanderson-use-wraps 2015-06-18 21:23:03 +02:00
Joffrey F f2bdd01e08 Merge branch 'aanand-allow-any-mode' 2015-06-18 21:21:48 +02:00
Joffrey F e05d06bcf2 Merge branch 'allow-any-mode' of https://github.com/aanand/docker-py into aanand-allow-any-mode 2015-06-18 21:10:13 +02:00
Joffrey F b78397d233 Merge pull request #633 from edmorley/update-b2d-shellinit-example 
Docs: Update boot2docker shellinit example to use 'eval'
 2015-06-18 11:54:16 -07:00
Joffrey F 6fd391840e Bumped default API version == 1.19 2015-06-18 20:38:52 +02:00
Joffrey F 4ec36c80a9 Only allow volume_driver param if API version >= 1.19 2015-06-18 20:38:52 +02:00
Joffrey F 26531f1f8d Enforce consistent style for push and pull methods 2015-06-18 20:38:52 +02:00
Joffrey F 38a6651ede small doc fixes 2015-06-18 20:38:52 +02:00
Joffrey F 93531e9cff Bumped version to 1.3.0 (dev) 2015-06-18 20:38:52 +02:00
Philipp Möller 3a32be79d3 Add and document a decode parameter for build 
This makes the build method consistent with the events method and adds
some convenience.
 2015-06-18 20:38:21 +02:00
Bradley Cicenas badc5b69ad Add raise_for_status check to push and pull methods 
as underlying exceptions(such as push already in progress) will be hidden in the stream generator otherwise.
 2015-06-18 20:38:21 +02:00
Luke Marsden 5fa7576e8c Add volume_driver param to client.create_container 
- Add appropriate test which also asserts that volume names can be passed through to drivers.
- Add new param to docs.

Signed-off-by: Luke Marsden <luke@clusterhq.com>
 2015-06-18 20:38:21 +02:00
Joffrey F e9802314aa Updated mkdocs to use the new pages index format 2015-06-18 20:38:07 +02:00
Joffrey F 89d5487285 Updated site_url value in mkdocs file 2015-06-18 20:14:37 +02:00
Joffrey F 6b9ea106d7 Fixed integration test 2015-06-18 19:58:01 +02:00
Joffrey F 6f343aa8ea Release 1.2.3 2015-06-18 19:50:31 +02:00
Joffrey F 6c92431c9e Merge branch '1.3.0-rc0' 2015-06-18 19:44:58 +02:00
Joffrey F f0a9c80a49 Updated ChangeLog for 1.2.3 2015-06-16 14:44:39 -07:00
Joffrey F fb5db84f0b Bump RC 2015-06-12 11:31:10 -07:00
Joffrey F 6e3dba99b7 Merge branch 'aanand-allow-binds-list' into 1.3.0-rc0 2015-06-12 11:29:56 -07:00
Aanand Prasad 1446b8c5ee Allow binds to be specified as a list of strings 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-12 12:36:59 -04:00
Ed Morley 9a5b7b2959 Docs: Update boot2docker shellinit example to use 'eval' 
The boot2docker documentation has since changed the recommended way to
use shellinit - see boot2docker/boot2docker#786. The command also no
longer prints the export lines to the console, so have updated the
example output.
 2015-06-10 14:32:49 +01:00
Aanand Prasad 7dd7625391 Allow any mode string to be passed into a volume bind 
Volume binds now take a "mode" key, whose value can be any string.

"ro" is still supported. It is an error to specify both "ro" and "mode".

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-05 13:25:59 +01:00
Scott Sanderson a7c15a8700 Use functools.wraps for check_resource decorator. 
This helps runtime introspection tools like the `help()` builting or
IPython's `?` operator correctly find the underlying method instead of
the decorator definition.
 2015-06-02 11:00:00 -04:00