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

1327 Commits

Author SHA1 Message Date
Joffrey F 1ca2bc58f0 Merge pull request #855 from docker/852-independent-integration 
Move methods/classes used by all integration tests to helpers.py
 2015-11-18 16:33:09 -08:00
Joffrey F 73b51400a1 Fix integration-dind-ssl make task 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2015-11-18 15:41:32 -08:00
Joffrey F de617375f1 Move methods/classes used by all integration tests to helpers.py 
Ensure setup_module is called at session level, making the test
suite not order dependent. Test files can be invoked independently.

Signed-off-by: Joffrey F <joffrey@docker.com>
 2015-11-18 15:40:54 -08:00
Joffrey F e1eefce7f9 Merge branch 'schu-oom-kill-disable-pr' 2015-11-18 14:48:55 -08:00
Joffrey F 64eac0b71c Wrong key name in stats test 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2015-11-18 14:47:48 -08:00
Joffrey F dfcc1d87bf Merge branch 'oom-kill-disable-pr' of https://github.com/schu/docker-py into schu-oom-kill-disable-pr 2015-11-18 14:35:54 -08:00
Joffrey F 9ed721957a Merge pull request #832 from aebm/master 
Fix #627
 2015-11-18 14:29:00 -08:00
Daniel Nephin 0284eadaff Merge pull request #805 from sourcelair/enhancement/stats-no-stream 
Add support for non-stream stats of containers
 2015-11-17 10:47:28 -05:00
Daniel Nephin 4e441b2a6b Merge pull request #834 from lots0logs/814-host-config-mem-swap 
Add support for MemorySwappiness to client.create_host_config()
 2015-11-16 11:37:15 -05:00
Joffrey F ac148393b1 Merge pull request #851 from docker/remove-ci-transition-files 
Remove unused files
 2015-11-12 11:51:32 -08:00
Joffrey F c3197dcce7 Merge pull request #850 from docker/mnowster-test-no-log-driver-specified 
Rebased #798
 2015-11-12 11:23:16 -08:00
Joffrey F c622ff64b9 Remove unused files 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2015-11-12 11:21:37 -08:00
Joffrey F b0bb4ff3a4 Merge branch 'test-no-log-driver-specified' of https://github.com/mnowster/docker-py into mnowster-test-no-log-driver-specified 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2015-11-12 11:11:51 -08:00
Daniel Nephin 6e73f04acc Merge pull request #796 from v-boyko/feature/logs_since 
Support the 'since' option in the 'containers/<id>/logs' endpoint (API upgrade)
 2015-11-12 14:07:54 -05:00
Joffrey F c89d366827 Merge pull request #848 from docker/845-fix 
Client.logs(tail=0) now shows no past logs (expected behavior)
 2015-11-12 10:54:51 -08:00
Joffrey F 0e13a0d7fd Client.logs(tail=0) now shows no past logs (expected behavior) 
Add test confirming the new behavior.

Signed-off-by: Joffrey F <joffrey@docker.com>
 2015-11-12 10:50:01 -08:00
Joffrey F fe858f5ecc Add build integration test checking stderr shows up in stream 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2015-11-11 17:14:03 -08:00
Joffrey F 523e6d48a7 Merge pull request #846 from docker/838-update 
Support for build arguments
 2015-11-11 13:37:09 -08:00
Joffrey F cefad9e23b Update buildargs test to avoid race condition 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2015-11-10 17:47:05 -08:00
Michael Schubert 8924319631 create_host_config: allow setting oom_kill_disable 
Signed-off-by: Michael Schubert <schu@schu.io>
 2015-11-10 11:08:24 +01:00
Leonty 5571d1af76 Support 'buildargs' parameter for docker 1.9. 
Signed-off-by: Leonty Balovnev <tigreavecdesailes@gmail.com>
 2015-11-10 00:23:16 +03:00
Dustin Falgout 64fc383f2c Update hostconfig.md 
Signed-off-by: Dustin Falgout <dustin@falgout.us>
 2015-11-09 02:41:15 -06:00
Aanand Prasad 881e24c231 Merge pull request #839 from docker/bump_api_version_121 
Bump default API version to 1.21
 2015-11-05 15:09:06 +00:00
Viacheslav Boiko 3330569772
Merge upstream branch 'master' into feature/logs_since 
Signed-off-by: Viacheslav Boiko <v.e.boyko@gmail.com>
 2015-11-05 11:56:06 +01:00
Dustin Falgout 01353c11ca Dont include mem_swappiness when testing use of str values 
Signed-off-by: Dustin Falgout <dustin@falgout.us>
 2015-11-05 02:52:18 -06:00
Dustin Falgout c07dd53a2a Incorporates feedback from and closes #814 
Signed-off-by: Dustin Falgout <dustin@falgout.us>
 2015-11-05 02:20:53 -06:00
Joffrey F 4f1304c108 Bump default API version to 1.21 
Update Makefile to run tests against dind 1.9.0
Update network tests to account for latest API changes

Signed-off-by: Joffrey F <joffrey@docker.com>
 2015-11-04 19:32:22 +01:00
Alejandro Brito Monedero a695f0ca5a Fix #627 
Docker-py couldn't pull private images if the account have non ascii chars
in either user or password. It that case an exception ending with no auth
credentials.
Instead docker client (golang) don't suffer this issue.

Also add a test to check the login or password even with non ascii char have
a valid auth dictionary

Signed-off-by: Alejandro Brito Monedero <abrito@alea-soluciones.com>
 2015-10-29 16:12:30 +01:00
Joffrey F 47ab89ec2b Merge pull request #830 from docker/fix-links-create-test 
Use network_mode=bridge when testing links
 2015-10-28 16:36:34 +01:00
Joffrey F aaeb6c1087 Use network_mode=bridge when testing links 
Links are only compatible with network mode bridge.
New versions of docker only create env entries when network mode
is properly set.

Signed-off-by: Joffrey F <joffrey@docker.com>
 2015-10-28 14:52:17 +01:00
Joffrey F f4c881f37d Merge pull request #827 from coreypobrien/lessbinding 
Move container volume bind tests to their own class
 2015-10-28 11:07:35 +01:00
Corey O'Brien a2184def6e Move container volume bind tests to their own class 
Signed-off-by: Corey O'Brien <coreypobrien@gmail.com>
 2015-10-27 16:08:58 -05:00
Joffrey F a610a1be0e Fix py3.2 test failure and unicode behavior 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2015-10-27 18:01:19 +01:00
Joffrey F 311ae711d4 Merge pull request #825 from aebm/master 
Fix auth.load_config bug calling parse_auth
 2015-10-27 15:57:00 +01:00
Joffrey F 929e046567 Merge pull request #824 from dnephin/fix_unicode_commands 
Support unicode commands
 2015-10-27 10:07:35 +01:00
Alejandro Brito Monedero 22da6ace7a Fix auth.load_config bug calling parse_auth 
When load_config found and auths section it didn't call parse_auth only with
the auths section. Instead it called parse_auth with all the configuration.

There is also a test to check this case

Signed-off-by: Alejandro Brito Monedero <alejandro.monedero@gmail.com>
 2015-10-27 09:03:28 +01:00
Daniel Nephin 417c80057b Support unicode commands. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-10-26 17:22:14 -04:00
Antonis Kalipetis 7e2ec1ac6b Add EditorConfig to the repo. 
Signed-off-by: Antonis Kalipetis <akalipetis@gmail.com>
 2015-10-22 14:06:45 +00:00
Antonis Kalipetis 5cfd2da448 Add test for streaming stats 
Also, fix typo in non-streaming stats.

Signed-off-by: Antonis Kalipetis <akalipetis@gmail.com>
 2015-10-22 14:05:55 +00:00
Antonis Kalipetis 192391a5a8 Add integration test for stats no-stream 
Signed-off-by: Antonis Kalipetis <akalipetis@gmail.com>
 2015-10-22 10:28:04 +00:00
Antonis Kalipetis 019a365a02 Enhance docs for stats method 
Signed-off-by: Antonis Kalipetis <akalipetis@gmail.com>
 2015-10-22 10:23:53 +00:00
Antonis Kalipetis a11c11430a Add suport for non-stream stats of containers 
Adds one more flag to the `stats` method for streaming responses.
Keeps default as streamed response for backwards compatibility.

Signed-off-by: Antonis Kalipetis <akalipetis@gmail.com>
 2015-10-22 10:23:53 +00:00
Joffrey F 0234ddebf3 Merge pull request #809 from docker/reorganize_tests 
Reorganize tests
 2015-10-21 16:44:45 -07:00
Joffrey F 93a296fb04 Reorganize test directories 
More clearly separate unit and integration tests
Allow splitting into multiple files
Cleaner

Signed-off-by: Joffrey F <joffrey@docker.com>
 2015-10-21 16:02:09 -07:00
Joffrey F 5a1c7ed8bf Merge pull request #820 from docker/819-volumes-create 
Update `Client.create_volume` to use new endpoint
 2015-10-21 14:21:01 -07:00
Joffrey F 0258c6e622 Update `Client.create_volume` to use new endpoint 
New API endpoint is POST /volumes/create (previously just /volumes)
Since the feature is yet unreleased (RC), no fallback strategy is
implemented.

Signed-off-by: Joffrey F <joffrey@docker.com>
 2015-10-21 13:51:09 -07:00
Joffrey F 4552e78c02 Merge pull request #812 from docker/811-unix-adapter 
Fix Unix adapter bug with newer versions of requests
 2015-10-21 11:00:00 -07:00
Joffrey F 326049c8bb Fix Unix adapter bug with newer versions of requests 
The select_proxy utility in requests errors out when the provided URL
doesn't have a hostname, like is the case when using a UNIX socket.
Since proxies are an irrelevant notion in the case of UNIX sockets
anyway, we simply return the path URL directly.

Signed-off-by: Joffrey F <joffrey@docker.com>
 2015-10-19 16:55:49 -07:00
Joffrey F fad509b3bd Back to dev version 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2015-10-19 16:55:24 -07:00
Daniel Nephin c698674602 Merge pull request #808 from alasdairnicol/docs_examples 
Docs examples
 2015-10-15 10:40:06 -04:00