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

653 Commits

Author SHA1 Message Date
Joffrey F a4aa1a88f1 Better pull confirmation 2014-12-15 13:53:49 -08:00
Joffrey F 4b91a71313 Longer timeout when contacting hub 2014-12-15 12:11:54 -08:00
Joffrey F 4598747f40 Merge pull request #386 from docker/0.6.0-release 
Release 0.6.0
 2014-11-03 14:56:04 -08:00
Joffrey F 8bc20e6c44 Fixed ChangeLog section titles 2014-11-03 23:53:53 +01:00
Joffrey F 1a3f3c1304 Fixed integration test 2014-11-03 23:52:03 +01:00
Joffrey F 079bf7ecfb exec -> execute 2014-11-03 23:02:14 +01:00
Joffrey F 0ff92f5f12 Merge branch 'master' into 0.6.0-release 2014-11-03 20:50:13 +01:00
Joffrey F 4c5cfc4800 Merge branch 'master' of github.com:dotcloud/docker-py 2014-11-03 20:49:56 +01:00
Joffrey F ba7fab1709 Changed assertIn to assertTrue(... in ...) (2.6 support) 2014-11-03 20:49:44 +01:00
Joffrey F 8ea385eb21 Updated ChangeLog 2014-11-03 20:39:49 +01:00
Joffrey F e35fa13110 Bumped version 2014-11-03 20:11:19 +01:00
Joffrey F 7a5f6137c8 Merge pull request #333 from alexliew/change_remove_image 
Change remove_image to check if image is a dictionary.
 2014-11-03 11:09:17 -08:00
Joffrey F 790ed5525a Merge branch 'irachex-filters' 2014-11-03 20:08:22 +01:00
Joffrey F 265d500f63 Updated tox.ini to also run utils_test.py tests 2014-11-03 20:07:13 +01:00
Joffrey F c4bb57286a Merge branch 'filters' of github.com:irachex/docker-py into irachex-filters 
Conflicts:
	docker/utils/__init__.py
	docker/utils/utils.py
	tests/utils_test.py
 2014-11-03 20:07:04 +01:00
Joffrey F 22ac1ec234 Merge pull request #319 from psftw/bugfix_history 
Make history() return json.
 2014-10-30 15:11:24 +01:00
Joffrey F e7f5766f30 Merge branch 'totem-feature_logs-tail' 2014-10-30 15:09:17 +01:00
Joffrey F 213ca7d71d Merge branch 'feature_logs-tail' of github.com:totem/docker-py into totem-feature_logs-tail 
Conflicts:
	docker/client.py
	tests/fake_api.py
 2014-10-30 15:07:58 +01:00
Joffrey F 92d1c8e77c Merge pull request #379 from tutumcloud/logs_tail 
Added tail behaviour to logs command, same as CLI v1.3 (latest)
 2014-10-30 14:57:12 +01:00
Joffrey F 10c67bde51 Merge pull request #381 from micahhausler/py3socket 
Fixed socket for PY3 - Fixes #342
 2014-10-30 14:51:50 +01:00
Joffrey F 91ba1a9426 Merge pull request #385 from fbacchella/master 
When docker is stopped, docker-py receive a empty string
 2014-10-30 14:25:21 +01:00
micahhausler 9d58b20b9d Reverted Dockerfile 2014-10-30 09:22:16 -04:00
Fabrice Bacchella 44b962c122 White space cleaned 2014-10-30 14:11:08 +01:00
Joffrey F bbe80d903f Merge branch 'master' of github.com:dotcloud/docker-py 2014-10-30 14:08:08 +01:00
Joffrey F 31fb94f973 Merge branch 'ewindisch-angry-poodle' 2014-10-30 14:07:52 +01:00
Joffrey F 8369113983 Fix typo 2014-10-30 14:07:37 +01:00
Joffrey F 0e1794facf Merge branch 'angry-poodle' of github.com:ewindisch/docker-py into ewindisch-angry-poodle 2014-10-30 14:03:51 +01:00
Joffrey F c5ffc15143 Added hosted docs info to README 2014-10-30 14:01:33 +01:00
Joffrey F 9b63cc548a Merge pull request #324 from infoxchange/clear-unixconn-pool 
Clear UNIX connections pool to avoid ResourceWarnings
 2014-10-30 13:49:40 +01:00
Fabrice Bacchella 4153a38d6c When docker is stopped, docker-py receive a empty string in socket.readline() 2014-10-30 11:00:28 +01:00
micahhausler b77f7e3b1a Added test requirements to install 2014-10-29 15:32:25 -04:00
micahhausler 1803c4b83d Fixed conflict 2014-10-29 15:21:18 -04:00
Eric Windisch 3529d5bb0d Require highest level of client-supported SSL/TLS crypto 
Up to TLS 1.2, support the highest locally supported crypto
protocol. This eliminates the previous default of PROTOCOL_SSLv23,
replacing it with what should be TLSv1 for Python 2.7 and TLSv1.2
for newer versions of Python 3.

Developers using docker-py may still specify the ssl_version to
override the default.

Signed-off-by: Eric Windisch <eric@windisch.us>
 2014-10-29 15:19:41 -04:00
Joffrey F cf9d75be0a Merge pull request #326 from tomprince/patch-1 
Add tests to sdist.
 2014-10-29 19:39:53 +01:00
Joffrey F 5ed8d16f43 Merge pull request #328 from alunduil/master 
Add tests to sdist.
 2014-10-29 19:39:18 +01:00
Joffrey F 1f4597e64f Merge pull request #360 from proppy/kwargs-from-env 
utils: add kwargs_from_env
 2014-10-29 19:37:50 +01:00
Joffrey F 984411ef8f Merge branch 'phensley-pause-unpause' 2014-10-29 19:35:17 +01:00
Joffrey F 37c8072f60 Merge branch 'pause-unpause' of github.com:phensley/docker-py into phensley-pause-unpause 
Conflicts:
	README.md
	tests/integration_test.py
	tests/test.py
 2014-10-29 19:35:05 +01:00
Johan Euphrosine 74e7a67898 utils: add kwargs_from_env 2014-10-29 10:05:49 -07:00
Joffrey F 0d806d81b4 Merge pull request #354 from bfirsh/use-official-repository-for-dockerfile 
Add Makefile for running tests in Docker
 2014-10-29 17:59:35 +01:00
Joffrey F 734da2c25c Merge branch 'dims-support-devices' 2014-10-29 17:23:57 +01:00
Joffrey F 75d8ff16e4 Merge branch 'support-devices' of github.com:dims/docker-py into dims-support-devices 
Conflicts:
	README.md
 2014-10-29 17:23:42 +01:00
Joffrey F 465e4d9a55 git push origin masterMerge branch 'phensley-exec' 2014-10-29 17:19:47 +01:00
Joffrey F e0d6b267ee Merge branch 'exec' of github.com:phensley/docker-py into phensley-exec 
Conflicts:
	README.md
 2014-10-29 17:19:27 +01:00
Joffrey F ca6fc27740 Merge pull request #306 from groundeffect/master 
Add support for 'cpuset'
 2014-10-29 17:01:01 +01:00
Joffrey F 217f97259b Merge pull request #366 from sgjesse/tar-directories 
Add directories to the Docker context
 2014-10-29 16:58:39 +01:00
Joffrey F 4ed1ee5b0f Merge pull request #375 from micahhausler/mkdocs 
Added markdown docs for #83
 2014-10-29 11:22:04 +01:00
micahhausler 77d2f42f7d Migrated change log 2014-10-28 10:42:19 -04:00
micahhausler 1476ad302d Fixed socket for py3 
* Fixed broken Dockerfile
* added .dockerignore
 2014-10-28 10:26:49 -04:00
micahhausler 47baf2218f Added .version() 2014-10-27 15:13:26 -04:00