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

365 Commits

Author SHA1 Message Date
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 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
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 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 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 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 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 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 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 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
micahhausler 1476ad302d Fixed socket for py3 
* Fixed broken Dockerfile
* added .dockerignore
 2014-10-28 10:26:49 -04:00
Alberto 5c06bc7f49 Added tail behaviour to logs command, same as CLI v1.3 (latest) 2014-10-27 18:31:47 +01:00
groundeffect 6a52269888 Move 'cpuset' to the end of the param list 2014-10-25 23:57:50 +02: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 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 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 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
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 537b468140 Fix attaching with UNIX sockets 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-10-16 17:25:21 +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
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
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
Huayi Zhang 589e7006d5 Add support for filtering images and containers 
[`filters` is a json encoded value of the filters (a map[string][string]) to process on the images list. ][1]
The tricky thing is that we must convert boolean value to string and any filter value to list to make a `map[string][string]` json format

[1]: https://docs.docker.com/reference/api/docker_remote_api_v1.14/#list-images
 2014-10-05 23:18:48 +08: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
Alexey Kotlyarov 6a7d284a1a Clear the UNIX connection sockets properly 2014-09-22 13:19:13 +10:00
Peter Salvatore 35e6892c71 Make history() return json. 2014-09-10 23:15:57 -04:00
Matthias Erll b5f08141e6 Renamed wrapper. 2014-09-09 08:52:02 +02:00
Matthias Erll e134e89682 Wrap response socket for platform compatibility. 2014-09-09 08:41:10 +02:00
Joffrey F 24b8d668ab Switch back to dev version 2014-09-08 18:25:09 +02:00