Commit Graph

1396 Commits

Author SHA1 Message Date
shin- ad75b37a46 Merge branch 'volumes-from-as-list' of github.com:blackrobot/docker-py into blackrobot-volumes-from-as-list 2014-04-04 16:59:57 +02:00
shin- 54c904f806 Updated unit tests API version, flake8 fixes 2014-04-04 16:55:01 +02:00
Joseph Schorr 156d14efd1 Revert unneeded change 2014-04-04 16:47:23 +02:00
Joseph Schorr 9ae3bcd2f3 Make sure the build command in the client sends the auth credentials along. Required for "FROM " lines that pull from private registries 2014-04-04 16:47:23 +02:00
shin- 2d56149831 Separated test dependencies from runtime dependencies 2014-04-04 16:41:26 +02:00
shin- 6d78986cc3 Fixed multiplexed_socket_stream_helper 2014-04-04 16:02:20 +02:00
shin- 93bb0c5b10 Merge branch 'PY3_fixes' of github.com:macobo/docker-py into macobo-PY3_fixes 2014-04-04 15:56:21 +02:00
Damon Jablons cdd52a172f Added test for container with volumes_from 2014-04-01 16:08:25 -04:00
Damon Jablons ced3d5d71a Ensure that volumes_from exists 2014-04-01 16:08:06 -04:00
Damon Jablons d3d594d0b6 Allow volumes_from to be an iterable 2014-04-01 15:20:13 -04:00
Maxime Petazzoni 445bcef386 Merge pull request #194 from mway/master
don't yield blank lines
2014-03-31 09:50:02 -07:00
Matt Way 66e6c9d4ef don't yield blank lines 2014-03-30 16:04:52 -04:00
Joffrey F bed0f7b83f Merge pull request #192 from rustyrobot/fix-flake8
Fixes for flake8
2014-03-29 18:05:34 +01:00
Evgeniy L 2a1484f655 Fixes for flake8
Next rules were broken
* E265 block comment should start with '# '
* E713 test for membership should be 'not in'
2014-03-28 23:08:22 +04:00
Joffrey F 24cc9df5f5 Merge pull request #180 from StarvingMarvin/parse_repository_tag
parse_repository_tag function and accompanying test
2014-03-26 18:53:51 +01:00
Luka Stojanovic 74499e21e4 make flake happy 2014-03-24 16:10:31 +01:00
Luka Stojanovic 030516eb29 parse_repository_tag function and accompanying test 2014-03-24 16:10:31 +01:00
Deni Bertovic 69cd38ab86 initial take on adding support for tls auth with client certificates 2014-03-22 14:09:10 +01:00
Maxime Petazzoni 7e105f5727 Merge pull request #184 from ibuildthecloud/fix-chunking
Use Requests.iter_lines to fix #176
2014-03-19 11:19:29 -07:00
Darren Shepherd e8b993ab8a Use requests to read chunk data instead of parsing the raw stream
The previous code had a bug in which it assumed that the chunk data had
no newlines in it.  In 0.9.0 newlines were added to the stream results,
which exposed this bug.
2014-03-19 08:43:13 -07:00
Darren Shepherd d0985b02be Ensure that stream=True is passed to requests when version >= 1.8 2014-03-19 08:41:59 -07:00
Joffrey F 7ea1195d28 Merge pull request #181 from dangra/strict-version
Fix API version comparison for 1.10
2014-03-18 15:39:19 +01:00
Daniel Graña b1f1e363a4 remove reference to uninitialized variable and extra parameter in function call 2014-03-18 11:00:16 -03:00
Daniel Graña 159a42ad5f Fix API version comparison 2014-03-18 11:00:16 -03:00
Maxime Petazzoni 8ffc1b269b Merge pull request #178 from rutsky/disable-websocker-on-py3
Use different requirements list on Python 2 and 3 (fixes #174)
2014-03-17 14:43:31 -07:00
Joffrey F beb8142d41 Merge pull request #172 from jdeppe-pivotal/master
Support 'Domainname' in container creation
2014-03-17 18:14:58 +01:00
Vladimir Rutsky 5c850d4822 Use different requirements list on Python 2 and 3
In Python 3 websocker-client not required (and previously requiested
version doesn't work at all).
2014-03-17 10:37:26 +04:00
Karl-Aksel Puulmann b4605fc728 Styling as per comment, decode to utf-8, join rather concat strings 2014-03-11 22:46:45 +02:00
Karl-Aksel Puulmann af84a2de72 Python 3 fixes 2014-03-11 19:24:49 +02:00
Jens Deppe f0b08d8adf Support 'Domainname' in container creation 2014-03-10 07:47:19 -07:00
Maxime Petazzoni 375521d7e2 Merge pull request #170 from cglewis/fixes_169
Fix install instructions (closes #169)
2014-02-26 17:27:45 -08:00
Charlie Lewis c5afe55263 closes #169 2014-02-26 15:56:57 -08:00
Maxime Petazzoni 655b5a304a Merge pull request #168 from joshuaconner/add_version_title_flag
add __title__ and __version__ variables to module
2014-02-24 18:08:52 -08:00
Joshua Conner 8d9b6828f0 add __title__ and __version__ variables to module 2014-02-24 18:01:19 -08:00
shin- 310049f65e Added installation instructions 2014-02-24 16:06:44 +01:00
shin- f594247365 Updated changelog, bumped version to 0.3.0 2014-02-24 15:52:12 +01:00
Joffrey F 0f366bf7a8 Merge pull request #167 from mpetazzoni/build-output
Fix build() and events() streaming
2014-02-24 15:48:52 +01:00
Maxime Petazzoni a102b189c6 Fix events() streaming by using _stream_helper()
Signed-off-by: Maxime Petazzoni <max@signalfuse.com>
2014-02-21 09:26:07 -08:00
Maxime Petazzoni 45cde4a034 Fix build() streaming and stream methods cleanup
Signed-off-by: Maxime Petazzoni <max@signalfuse.com>
2014-02-21 09:26:07 -08:00
Maxime Petazzoni af1bb34d98 Clarify port bindings documentation for non-TCP port bindings
Signed-off-by: Maxime Petazzoni <max@signalfuse.com>
2014-02-18 14:39:04 -08:00
shin- 82f4c271ea Updated integration tests 2014-02-18 19:58:50 +01:00
Joffrey F 7a39cda22a Merge pull request #165 from stpierre/fix-http-error
Fix APIError for requests 1.1
2014-02-10 16:20:19 +01:00
Chris St. Pierre cfbd41ca56 Fix APIError for requests 1.1
requests 1.1, which is what's available on CentOS 6, doesn't support
passing the response code as a keyword argument.  It can be set after
the fact on both requests 1.1 and 1.2.

Docker-DCO-1.1-Signed-off-by: Chris St. Pierre <chris.a.st.pierre@gmail.com> (github: stpierre)
2014-02-10 09:52:51 -05:00
Joffrey F 4b090441bc Merge pull request #161 from mpetazzoni/api-1.8
Support remote API v1.8 (and make it the default)
2014-02-06 17:25:47 +01:00
Maxime Petazzoni 64f4ba90ff Support remote API v1.8 (and make it the default)
Signed-off-by: Maxime Petazzoni <max@signalfuse.com>
2014-02-05 15:25:49 -08:00
Maxime Petazzoni 417d691268 Merge pull request #158 from a-ba/master
Fixed malformatted request when using empty list in create_container()
2014-02-05 13:29:46 -08:00
Anthony Baire f7cef8a3e2 Fixed malformatted request when using empty list in create_container()
create_container() sends a malformatted request when volumes==[] or
ports==[], causing error 500 "create: ExportEnv json: cannot unmarshal
array into Go value of type map"

The empty lists must be converted into a dict (or removed)
2014-02-04 11:35:06 +01:00
Joffrey F 548b1e7f6c Merge pull request #156 from dmiyakawa/master
Allow copy() to accept dictionary like diff()
2014-01-31 09:40:23 -08:00
Joffrey F 789c22b933 Merge pull request #155 from bfirsh/fix-concat-string-with-bytes
Fix _stream_result concatenating bytes with str
2014-01-31 09:39:37 -08:00
Joffrey F c00618d336 Merge pull request #157 from ticosax/ping-fixes
Ping fixes
2014-01-31 09:38:46 -08:00