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

314 Commits

Author SHA1 Message Date
Maxime Petazzoni dad95ba679 Default to /tcp for port definitions in create_container() 
Fixes #141.

Signed-off-by: Maxime Petazzoni <max@signalfuse.com>
 2014-01-16 10:23:02 -08:00
Maxime Petazzoni 77edd8b601 Merge pull request #138 from aanand/container-output-without-logs 
container_output() method for streaming the output without logs=1
 2014-01-16 09:05:46 -08:00
Maxime Petazzoni 7aba0126cb Merge pull request #142 from aanand/use-relative-imports 
Use relative imports
 2014-01-16 09:05:14 -08:00
Aanand Prasad cea085f046 Use relative imports 2014-01-16 13:28:00 +00:00
Aanand Prasad 3cb6482f8a attach() method now parses multiplexing frames 
The previous version of `attach` didn't look like it was doing
anything useful, as it just yielded 4096-byte chunks of raw /attach
output, without doing any frame parsing.

Now `attach` is identical to `logs`, except that by default it
doesn't show historical output. `logs` is now a wrapper around
`attach` which sets `logs=True`, and its behaviour is unchanged.
 2014-01-16 10:56:17 +00:00
Maxime Petazzoni d73901a7ed Merge pull request #140 from aanand/sensible-url-handling 
Sensible url handling
 2014-01-14 10:13:09 -08:00
Aanand Prasad 688554998a Accept base_url of None 
This makes it very simple to get identical behaviour to the CLI:

    client = Client(os.environ.get('DOCKER_HOST'))
 2014-01-14 17:19:39 +00:00
Joffrey F ebddf043e7 Merge pull request #139 from aanand/no-timeout-on-build 
Configurable timeout on build(), defaults to None
 2014-01-14 09:16:40 -08:00
Aanand Prasad 96932fc1cb Handle tcp:// URLs 
This means docker-py will do the Right Thing if the base url is set
using the new `DOCKER_HOST` environment variable, for example.
(http://docs.docker.io/en/latest/commandline/cli/)
 2014-01-14 17:14:27 +00:00
Aanand Prasad dac4211a85 Break down _post() parameters one-per-line in build() 2014-01-14 15:25:29 +00:00
Aanand Prasad 732b4378ae Configurable timeout on build(), defaults to None 
Many commands used in Dockerfiles hang for an extended period of time
without producing any output, which will result in a socket timeout.
Accordingly, it makes sense for build() to specify no timeout by
default.
 2014-01-14 13:58:51 +00:00
Joffrey F 2ac5cca84d Merge pull request #120 from mpetazzoni/improve-auth 
Rework auth config loading and use of auth data for login/pull/push
 2014-01-09 11:00:55 -08:00
Maxime Petazzoni 32ad01e110 Rework auth config loading and use of auth data for login/pull/push 
Signed-off-by: Maxime Petazzoni <max@signalfuse.com>
 2014-01-07 15:30:50 -08:00
Maxime Petazzoni 0bce148062 Merge pull request #134 from ticosax/improve-trove-classification 
Declare explicitly supported python versions
 2014-01-07 13:37:02 -08:00
Nicolas Delaby 700fbd3df7 Declare explicitly supported python versions 2014-01-07 15:08:32 +01:00
Maxime Petazzoni 2891c63870 Merge pull request #133 from namin/network-disabled-opt 
Option to disable network when creating container.
 2014-01-05 22:25:51 -08:00
Nada Amin d1427d38be Option to disable network when creating container. 2014-01-03 16:20:45 +00:00
Maxime Petazzoni 86a504752c Merge pull request #132 from DevTable/master 
A socket that is wrapped in a file-like object must be set to blocking.
 2014-01-02 13:50:52 -08:00
Jake Moshenko 294b42c6cd A socket that is wrapped in a file-like object must be set to blocking. 2013-12-31 14:27:05 -05:00
Joffrey F 6f2ca81e31 Merge pull request #131 from antigluk/master 
"six" dependency fixed to greater-or-equal
 2013-12-30 08:32:06 -08:00
Roman Rader 9787c004e5 "six" dependency fixed to greater-or-equal 2013-12-30 17:49:43 +02:00
Maxime Petazzoni ef009e114a Style fixes for flake8 
Signed-off-by: Maxime Petazzoni <max@signalfuse.com>
 2013-12-24 10:07:25 -08:00
Maxime Petazzoni 016a4d961c Merge pull request #128 from slon/master 
Fix infinite loop in Client.logs(stream=True) caused by connection close...
 2013-12-24 10:04:32 -08:00
Fedor Korotkiy 09f95768f3 Fix infinite loop in Client.logs(stream=True) caused by connection close. 2013-12-24 12:01:16 +00:00
Maxime Petazzoni 20a2c23bc2 Merge pull request #127 from daniellawrence/patch-1 
Updated using volumes (binds)
 2013-12-22 18:18:50 -08:00
Daniel 761a97546f Updated using volumes (binds) 
bindings of volumes is called 'binds' not 'bindings'

https://github.com/dotcloud/docker-py/blob/master/docker/client.py#L640
 2013-12-23 10:28:43 +11:00
Maxime Petazzoni fd38b0e7e7 Merge pull request #126 from eltimn/patch-1 
Updated function signatures in README
 2013-12-22 11:10:16 -08:00
Tim Nelson 0eaafe2a9f Updated function signatures in README 2013-12-22 03:20:16 -06:00
Joffrey F 67e50b4f9f Merge pull request #118 from mpetazzoni/master 
README.md formatting changes
 2013-12-17 06:37:18 -08:00
Joffrey F 792fff6b47 Merge pull request #122 from mpetazzoni/base-url-sanitize 
Remove trailing slashes in base_url
 2013-12-17 05:55:18 -08:00
Joffrey F 98c5a85ac4 Merge pull request #123 from mpetazzoni/fix-log-stream-recvall 
Fix stream receive by correctly reading all required bytes from the socket
 2013-12-17 05:53:41 -08:00
Maxime Petazzoni 1fe3c041c4 Fix stream receive by correctly reading all required bytes from the socket 
Signed-off-by: Maxime Petazzoni <max@signalfuse.com>
 2013-12-16 15:54:19 -08:00
Maxime Petazzoni 9b4582989b Remove trailing slashes in base_url. Fixes #108 
Signed-off-by: Maxime Petazzoni <max@signalfuse.com>
 2013-12-16 15:30:44 -08:00
Maxime Petazzoni 0e202f9bb9 README.md formatting changes 
Signed-off-by: Maxime Petazzoni <max@signalfuse.com>
 2013-12-13 13:55:15 -08:00
shin- 5c928dcab5 Fixed start_container_with_port_binds test 2013-12-13 15:47:24 +01:00
shin- 64781888e0 Merge branch 'privilege' of github.com:yukw777/docker-py into yukw777-privilege 
Conflicts:
	README.md
	tests/test.py
 2013-12-13 15:46:54 +01:00
shin- 9bbbb5d3b4 Fixed indentation 2013-12-13 15:27:00 +01:00
Maxime Petazzoni 4bc4ee3cf0 Log streaming and correct decoding of multiplexed log streams 
Implement log streaming with the stream parameter on logs(), returning a
generator of log lines based on the selected streams (stdout/stderr).
Also correctly decode the multiplexed log streams (current version was
buggy).

Signed-off-by: Maxime Petazzoni <max@signalfuse.com>
 2013-12-12 22:26:17 -08:00
shin- 5e68ed1df8 Updated changelog, bumped version in setup.py 2013-12-10 19:53:58 +01:00
Joffrey F 08d6de7ca1 Merge pull request #115 from dotcloud/port_volumes 
Simplified port bindings and volume mapping
 2013-12-09 09:10:26 -08:00
shin- 89f2c58918 Improved port binding conversion rules, fixed bugs, added unit tests 2013-12-09 17:45:12 +01:00
Joffrey F 4fde1a242e Merge pull request #117 from mpetazzoni/fix-streaming 
Fix _stream_helper
 2013-12-09 07:20:36 -08:00
Maxime Petazzoni c60c0d24a9 Fix _stream_helper 
The stream helper that yields the streamed status for push, pull and
build operations was reading data in chunks of 4096 bytes but didn't
support buffering and thus didn't behave well when more than 4096 bytes
were received at once from the socket.

This implementation uses makefile() to get a file object from the socket
on which we can use readline() so we can read line by line the
chunked-encoding data streamed to us by the Docker daemon.

Signed-off-by: Maxime Petazzoni <max@signalfuse.com>
 2013-12-06 16:44:47 -08:00
shin- ef615f5549 Flake8 fix 2013-12-06 21:05:59 +01:00
shin- e00a7e986a Simplified port bindings and volume mapping 2013-12-06 21:00:44 +01:00
Peter Yu 26f6f2bc40 rebased and updated the README 2013-12-06 15:31:15 +00:00
Joris van de Donk 7ae66d5ff4 Update README.md 
Derp. Removed extra space.
 2013-12-06 15:31:15 +00:00
Joris van de Donk ed45f1fd1b Fix readme.md documentation for the 'volume' arg in create_container 
Correct syntax is volumes={"/some/mount/point": {}}, not volumes={"/some/mount/point": ""}.
 2013-12-06 15:31:15 +00:00
Fernando 0cb2ce8126 fix auth ping to https 2013-12-06 15:31:15 +00:00
Maxime Petazzoni f6b345e19c Correctly pass the response parameter to the HTTPError constructor 
Signed-off-by: Maxime Petazzoni <max@signalfuse.com>
 2013-12-06 15:31:15 +00:00