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

239 Commits

Author SHA1 Message Date
Davanum Srinivas d9fa43a9b7 flake8 fails with F821 for unicode under python 3.4.2 2014-12-18 11:08:37 -05:00
Marcus Cobden 17c1869304 Tidy up stream test harness & fix race conditions 2014-12-18 09:23:21 +00:00
Joffrey F 8aded4842b Retry on connection error 2014-12-17 12:55:49 -08:00
Joffrey F f75afc92a2 Use unicode() typecast instead of u'' literal (3.2 compat). Fixes #408 2014-12-17 12:07:35 -08:00
Joffrey F b1e0ca0bd6 Merge branch 'master' of https://github.com/leth/docker-py into leth-master 
Conflicts:
	tests/test.py
 2014-12-17 11:56:58 -08:00
Joffrey F 2b5516afab Re-added integration tests with hostconfig in start 2014-12-17 11:44:52 -08:00
Joffrey F 12aad176b9 Re-added start with hostconfig tests 2014-12-17 11:44:52 -08:00
Joffrey F c29a6a2841 Fixed start_container tests 2014-12-17 11:44:52 -08:00
Joffrey F e992a8127d assertEquals -> assertEqual 2014-12-17 11:44:51 -08:00
Joffrey F 66112561f4 Updated integration tests to use new host_config param 2014-12-17 11:44:51 -08:00
Joffrey F 19b1379f17 Updated unit tests 
* Warnings will now raise exceptions in unit tests
* Updated several tests to use host_config
 2014-12-17 11:44:51 -08:00
Joffrey F b214406b38 Updated mock API version 2014-12-17 11:44:31 -08:00
Joffrey F f2ba7f9b9d Merge pull request #429 from dims/master 
Devices should be separated by colon separated string
 2014-12-17 11:32:58 -08:00
Davanum Srinivas 3a51d3fe0b Devices should be separated by colon separated string 
Totally bad test :( (written by me). The documentation and
code should match now. Many thanks to pranavs18 for spotting
the error and proposing the fix.
 2014-12-17 07:35:07 -05:00
Marcus Cobden 578dda64c9 Consume from chunked streams without data loss 
Data already in local python buffers was lost when stream socket
fileobject was re-created. We now use http.client to handle the chunk
transfer encoding, and we read only the data from each chunk.

This adds a test harness for stream responses which tries to trigger the
lost-buffer behaviour by responding to the HTTP request in full, as
early as possible.

NB: Python's http.client will close the socket fileobj early if there is
no content length or chunked transfer encoding header. If this happens,
requests/urllib3 will reopen it, but we lose some data which was stored
in buffers.
 2014-12-16 20:36:08 +00:00
Joffrey F 73b15be0c1 Merge pull request #423 from docker/0.6.0-integration 
Fixed integration tests
 2014-12-15 15:01:20 -08:00
Joffrey F bf9e1c84ba Don't use old test image (deprecated ID scheme) 2014-12-15 14:52:51 -08:00
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
Derek Hammer d8e8400419 Allow for pull as an option to docker build 
Signed-off-by: Derek Hammer <derek.r.hammer@gmail.com>
 2014-12-13 10:31:47 -08:00
Joffrey F a9bc84cece Enforce passing string as version param in ctor 2014-11-26 23:14:19 +01:00
Joffrey F 1a3f3c1304 Fixed integration test 2014-11-03 23:52:03 +01:00
Joffrey F ba7fab1709 Changed assertIn to assertTrue(... in ...) (2.6 support) 2014-11-03 20:49:44 +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 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 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
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
Alberto 5c06bc7f49 Added tail behaviour to logs command, same as CLI v1.3 (latest) 2014-10-27 18:31:47 +01: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
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 e70f985b31 Fix typo in exec url. 2014-10-18 11:35:16 -04:00
Patrick Hensley f95c8c4dfc Unit and integration tests for exec. 2014-10-17 16:06:14 -04: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 288e53b28b Unit and integration tests for pause/unpause. 2014-10-04 23:46:33 -04:00
Alexey Kotlyarov aff1fbc506 Test resource warnings when using the client 2014-09-22 16:24:23 +10:00
Joffrey F ff8c9bb5fd Fixed integration tests 2014-09-08 17:22:32 +02:00
Christian Hammerl 9523950829 add support to add or drop capabilities 2014-09-04 23:15:47 +02:00
davy 4388157fef Added support for 'cpuset' 2014-08-27 13:38:27 +02:00
Shreyas Karnik c6046ac137 first cut of restart policy 2014-08-26 21:35:04 -05:00
sukrit007 c27a459e61 Add support for tailing logs (introduced in API : v1.13) 
Updated default version to v1.13
 2014-08-22 16:32:48 -07:00
Joffrey F 9999cb0663 pep8 fix 2014-08-22 17:08:57 +02:00
Cameron Maske 5800c4ab06 Allow pushing a single tag. 
Closes #282
 2014-08-22 10:14:51 -04:00
Joffrey F dba1c45454 Merge pull request #291 from yograterol/master 
Volumes parameter on create_container should be validated as string
 2014-08-22 13:12:41 +02:00
Maxime Petazzoni 97366f6b60 Stop timeout should be added to the request timeout 
Using the max of the stop timeout and request timeout did not entirely
make sure that a stop timeout greater than a request timeout wouldn't
fail prematurely with a HTTPTimeout exception. The correct behavior is
to add the timeouts together, as the stop timeout is understood to be
part of the "request processing time". Any transport-level timeout thus
comes in addition to that.

Signed-off-by: Maxime Petazzoni <max@signalfuse.com>
 2014-08-19 10:37:54 -07:00
Yohan Graterol 28e27eb81a Create test for volume as string 2014-08-17 02:42:35 -05:00
Leonid Mirsky 98a4aa994c Adding tests for mem_limit string conversion + adding default unit 2014-08-05 22:02:02 +03:00
Joffrey F e2ac293c1e Merge pull request #280 from emonty/remove_auth_from_tests 
Protect push tests from environment
 2014-07-23 20:26:02 +02:00
Joffrey F 8e45264907 Merge pull request #268 from brutasse/265-dockerignore 
Add support for .dockerignore
 2014-07-23 20:25:07 +02:00
Bruno Renié 87b4d327d1 Add support for .dockerignore 
Fixes #265.

Implementation is a bit more elaborate than docker's implementation and
matches with the one proposed in dotcloud/docker#6869 to handle permission
issues more nicely.
 2014-07-23 15:05:53 +02:00
Monty Taylor 5f2c3de6bb Protect push tests from environment 
If the tests are run somewhere that somebody has push auth
configured, the auth headers bleed into the tests. Add a mock
to prevent that from happening.
 2014-07-22 10:26:46 -07:00
Joffrey F ed2b4581d7 Merge pull request #259 from dotcloud/166-complete-parse-host 
Support same URL schemes as Docker
 2014-07-09 17:34:25 +02:00
Michael Merickel e15b3bb689 allow docker client to connect to a remote host 
to run the tests on a host without using the default unix socket, it's
now possible to specify:

    DOCKER_HOST=tcp://localdocker:4243 env/bin/python setup.py test
 2014-07-07 10:03:42 -05:00
Michael Merickel 272c1f8634 support specifying location of temp folders 
TestWithBinds was failing when shared folders are used because /tmp was
not shared from OS X to my VM. This fix allows the location of the temp
folders to be changed via:

    TMPDIR=$(pwd) env/bin/python setup.py test

This also properly cleans up temp folders which were sticking around
before.
 2014-07-05 14:44:14 -05:00
Michael Merickel b5e75c4019 fix ListContainers which was failing with "executable true; not found" 2014-07-05 14:20:11 -05:00
Joffrey F d33ba883f1 Fixed base_url related tests 2014-07-03 04:16:08 +02:00
Joffrey F cf050d28a0 Implemented complete parse_host method to handle all accepted values of Client's base_url. Unit tests 2014-07-03 04:11:34 +02:00
Ali Vakilzade ea728c1bd5 get size from Client.containers 2014-06-22 21:10:28 +04:30
d11wtq 1ec551cbe7 Add resize() method to Client 2014-06-21 12:21:44 +00:00
Joffrey F 8a63e70bca Updated/fixed integration tests. Moved 'pull busybox' out of setUp(). Commented out logs streaming test 2014-06-20 20:57:29 +02:00
Joffrey F be0afebc98 Update unit tests to use API v1.12 2014-06-20 20:55:49 +02:00
Joffrey F de066a1ae6 Python, not Go 2014-06-17 03:21:42 +02:00
Joffrey F fb11abc8c6 Merge pull request #236 from rail44/feature-support-get-and-load-image 
Support get and load image
 2014-06-17 02:24:30 +02:00
Satoshi Amemiya 9461035d49 Support get and load image 2014-06-02 16:41:52 +09:00
Sam Riley d34b78aac5 Fix joining of unicode and byte strings in python3. 
Check logs response in unit tests, and fix log integration tests for
py3.
 2014-06-01 09:01:42 +01:00
Joffrey F c2b259009a Updated unit tests 2014-05-28 02:03:10 +02:00
Maxime Petazzoni 55b93d676b Merge pull request #210 from aanand/universally-compatible-chunking 
Universally-compatible reading of chunked streams
 2014-05-21 11:06:23 -07:00
Joffrey F 97c9de0203 Merge pull request #221 from tutumcloud/memoryswap 
memory swap limit support
 2014-05-13 21:30:41 +02:00
Bernardo 7497daf34a memory swap limit support 2014-05-11 17:45:15 -04:00
Joffrey F 9bb292bcbd Merge pull request #209 from tarnfeld/feature/build-context 
Added ability to specify the full build context
 2014-04-28 20:51:46 +02:00
Aanand Prasad 073fdaf671 Universally-compatible reading of chunked streams 
Docker introduced newlines in stream output in version 0.9
(https://github.com/dotcloud/docker/pull/4276), but not to all
endpoints - POST /images/create, for example, does not include them.

This reverts to the old, less pleasant implementation of
_stream_helper(), with a manual check for newlines to fix the problem
described in #176 and fixed in #184, without the accompanying
regression. It should work against Docker 0.8, 0.9 and 0.10, both when
building and when pulling.
 2014-04-28 17:22:14 +01:00
Aanand Prasad fdd39a85cc Fix integration test regression 
The test for starting a container with volume binds hadn't been updated
to use the new dictionary structure for the `binds` argument.
 2014-04-28 17:18:39 +01:00
Joffrey F 6c1f7f3e97 Merge pull request #198 from fcoelho/fix-volumes-from 
Sanitize create_container input for volumes_from
 2014-04-23 19:47:07 +02:00
Tom Arnfeld 8acff57f6a Added test for gzip compressed tar 2014-04-23 13:42:05 +01:00
Tom Arnfeld 45ef4ab931 Fix for pep8 failures 2014-04-23 13:36:36 +01:00
Tom Arnfeld 8983fa561c Added ability to specify the full build context 2014-04-23 13:18:50 +01:00
Ryan Wallner 77fec67c60 fixes #175, fix flake8 erros 2014-04-16 14:40:08 -04:00
Felipe Bessa Coelho 3fa6f231fa Missed empty line for flake8 2014-04-09 13:24:57 -03:00
Felipe Bessa Coelho 16ad8198a9 Add test to check for the absence of volumes_from 2014-04-09 13:10:08 -03:00
Evgeniy L 18d4db09ec Moved APIError exception to docker.errors module. 2014-04-07 13:31:13 +04:00
shin- 8eedbc895e Fixed integration tests 2014-04-04 18:16:47 +02:00
shin- a37d0eea16 Added unit test for create_container with volumes_from 2014-04-04 17:11:00 +02:00
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
Damon Jablons cdd52a172f Added test for container with volumes_from 2014-04-01 16:08:25 -04: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
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
shin- 82f4c271ea Updated integration tests 2014-02-18 19:58:50 +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
Darren Shepherd 8448d0217b Fix unit tests broken by PR #151 
Updates newer unit tests to use the http+unix scheme.
 2014-01-27 11:25:32 -07:00