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

607 Commits

Author SHA1 Message Date
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 47baf2218f Added .version() 2014-10-27 15:13:26 -04:00
micahhausler 0e6b96a70f Added .wait() 2014-10-27 15:06:28 -04:00
micahhausler 7d0f190d0b Capitalize Docker 2014-10-27 14:56:43 -04:00
groundeffect 6a52269888 Move 'cpuset' to the end of the param list 2014-10-25 23:57:50 +02:00
micahhausler 199023c576 Added markdown docs 2014-10-24 16:55:22 -04:00
Davanum Srinivas 7a917cc7a0 Ability to specify Host Devices during container start 
The command line and daemon started supporting --device
parameter during docker start a while ago in the following commit:
docker/docker@e855c4b

Since the command line looks like this,
--device=[] Add a host device to the container (e.g. --device=/dev/sdc:/dev/xvdc)
This patch allows a list of strings to be passed into the start() method
and we parse out the 3 components just like in the above mentioned commit
 2014-10-24 11:43:30 -04:00
Patrick Hensley b365796439 Use shlex for exec string cmd, added integration testcase. 2014-10-22 13:44:41 -04:00
Joffrey F b93fca639e Merge pull request #337 from heewa/catch_invalid_build 
Catch invalid path in build method
 2014-10-22 19:23:46 +02:00
Søren Gjesse a6af1b7fd4 Fix long line 2014-10-21 14:20:37 +02:00
Søren Gjesse 71b26b7167 Remove accidental changes to integration_test.py 2014-10-21 14:17:39 +02:00
Søren Gjesse 60edfe84b8 Add directories to the Docker context 
This change adds both files and directories to the tra-file for the
Docker context. Previously only files where added.

The context will now also contain empty directoryes and symlinks
to directories.
 2014-10-21 14:01:57 +02:00
Patrick Hensley 3ac4c78850 Updated README with description of exec. 2014-10-18 11:45:59 -04:00
Patrick Hensley e70f985b31 Fix typo in exec url. 2014-10-18 11:35:16 -04:00
Patrick Hensley d328a836fc Shorten overlong line, fix indent. 2014-10-17 16:25:33 -04:00
Patrick Hensley f95c8c4dfc Unit and integration tests for exec. 2014-10-17 16:06:14 -04:00
Patrick Hensley fce477243e Implemented exec command. 2014-10-17 16:06:01 -04:00
John Costa d26428b633 Merge pull request #356 from bfirsh/ship-0.5.3 
Ship 0.5.3
 2014-10-16 13:41:16 -04:00
John Costa d68984dcbc Merge pull request #355 from bfirsh/fix-attaching-to-unix-sockets 
Fix attaching with UNIX sockets
 2014-10-16 13:41:08 -04:00
Ben Firshman 5323c14ba8 Ship 0.5.3 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-10-16 18:03:52 +01:00
Ben Firshman 4d0416ac91 Add Makefile for running tests in Docker 
It assumes you've got Docker running on /var/run/docker.sock, but
that should be the case on both Linux and in Boot2Docker.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-10-16 17:55:22 +01:00
Ben Firshman 537b468140 Fix attaching with UNIX sockets 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-10-16 17:25:21 +01:00
Ben Firshman 695a894a53 Install test requirements in Dockerfile 
Handy for running tests and so on.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-10-16 17:15:13 +01:00
Ben Firshman a302932c8f Use official python repository in Dockerfile 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-10-16 17:15:13 +01:00
Sam Alba 721edfd526 Merge pull request #353 from bfirsh/ship-0.5.2 
Ship 0.5.2
 2014-10-16 07:54:23 -07:00
Sam Alba 91b1a93100 Merge pull request #352 from bfirsh/fix-tls-sockets-being-closed-when-attaching 
Stop TLS sockets being closed when attaching
 2014-10-16 07:54:01 -07:00
Ben Firshman bb5e1fd365 Ship 0.5.2 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-10-16 14:14:58 +01:00
Ben Firshman 7625d08c55 Stop TLS sockets being closed when attaching 
When calling attach_socket, the response is garbage collected,
which triggers a close method on the file object, closing the socket.
This stop the response from being garbage collected until we've
finished with the underlying socket.

Fixes #350

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-10-16 12:30:36 +01:00
Sam Alba a22ee2a97b Merge pull request #349 from bfirsh/ship-0.5.1 
Ship 0.5.1
 2014-10-14 09:29:28 -07:00
Sam Alba ff1f11b143 Merge pull request #347 from aanand/override-assert-hostname 
Enable the overriding of `assert_hostname` on TLSConfig
 2014-10-14 09:28:37 -07:00
Ben Firshman 04db8e5c85 Ship 0.5.1 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-10-14 17:10:52 +01:00
Aanand Prasad 4bf438d7b8 Enable the overriding of `assert_hostname` on TLSConfig 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-10-14 12:04:46 +01:00
Aanand Prasad 7db976c1e3 Fix typos in ssladapter.py 
- Check that `urllib_ver` is not None, instead of `urllib3`
- Do version comparison only if `urllib_ver` is *not* "dev"

Fixes #325. Original work by @sidprak.
 2014-10-14 12:04:46 +01:00
Patrick Hensley 288e53b28b Unit and integration tests for pause/unpause. 2014-10-04 23:46:33 -04:00
Patrick Hensley 75e53f1add Added pause/unpause methods. 2014-10-04 23:18:44 -04:00
Heewa Barfchin 39e19c18b8 Catch invalid path in build method 
The server responds with an unuseful message (server error EOF), which
happens because an empty tar file is sent over. So check in the client,
who knows why that's happening and tell the user.
 2014-10-04 18:14:23 -04:00
Joffrey F 7a46297085 Merge pull request #316 from Precis/socket_wrapper 
Wrap response socket for platform compatibility.
 2014-09-10 18:23:18 +02:00
Matthias Erll b5f08141e6 Renamed wrapper. 2014-09-09 08:52:02 +02:00