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

542 Commits

Author SHA1 Message Date
Daniel Nephin d9d84ce8d1 Format environment variables to match docker-cli. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2016-02-23 16:30:26 -08:00
Joffrey F 7440603d98 Improve parse_bytes util method 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-23 16:18:45 -08:00
Joffrey F a710fbf60a Unit test for Client.update_container method 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-23 16:18:36 -08:00
Joffrey F c3ba50c98d New `update_container` method 
Allows user to update container limits in-flight.

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-23 16:18:36 -08:00
Aanand Prasad 9ba0ddf267 Fix TLS regressions 
- Set `verify` to the CA cert path if one has been specified, rather
  than `True`

- Don't set `assert_fingerprint`

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-23 14:29:52 -08:00
Stéphane Seguin 71fafd3209 Separate params stream and follow for logs. 
Closes #934

Signed-off-by: Stéphane Seguin <stephseguin93@gmail.com>
 2016-02-16 18:51:55 +01:00
Joffrey F c3a66cc599 Merge pull request #928 from docker/926-ignored_dockerfiles 
Never exclude Dockerfile from the build context.
 2016-02-09 12:52:04 -08:00
Joffrey F 90760cfe1d Never exclude Dockerfile from the build context. 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-09 12:11:30 -08:00
Joffrey F dc198be26c Don't break when parsing unknown config keys 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-09 12:08:34 -08:00
Joffrey F fea32eb983 Merge branch 'VolumeBind' of https://github.com/keloyang/docker-py into keloyang-VolumeBind 2016-02-08 11:36:09 -08:00
Joffrey F 8bdaffc2e7 Merge pull request #920 from docker/ssl_version_simpler 
Remove obsolete SSL version computation
 2016-02-05 12:41:02 -08:00
Mike Dougherty 387db11009 Re-write kwargs_from_env to handle TLS options better 
This more closely matches the way the docker client interprets the
relevant environment variables. Among other things, it's now possible to
set DOCKER_TLS_VERIFY=false.

Signed-off-by: Mike Dougherty <mike.dougherty@docker.com>
 2016-02-04 17:13:09 -08:00
Spencer Rinehart fca622cad7 Add support for shm_size. 
--shm-size was added to Docker in 1.10 via docker/docker#16168.  See
docker/compose#2823 for more details.

Signed-off-by: Spencer Rinehart <anubis@overthemonkey.com>
 2016-02-04 12:33:05 -06:00
yangshukui f4b3a1bddd create tempfile in VolumeBindTest for non-auto-creating of docker 
Signed-off-by: yangshukui <yangshukui@huawei.com>
 2016-02-04 15:49:15 +08:00
Joffrey F b808cc45b4 Remove obsolete SSL version computation 
Recent versions of urllib3 (including the one packaged by requests)
will automatically reject SSLv2/3.
Additional test to check urllib3's behavior (mostly for release/packaging)

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-03 17:50:52 -08:00
Joffrey F bb94fe7a8c Support unspecified protocol in base_url when using TLS 
(assume HTTPS)

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-28 16:25:23 -08:00
Aanand Prasad 403d271cc2 Raise exceptions for API errors on network connect/disconnect 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-25 18:19:32 +00:00
Aanand Prasad 01a754a7f7 Support links when creating containers or connecting to networks 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-20 17:47:45 +00:00
Joffrey F eb1f24a1fc Merge pull request #880 from docker/813-parse-float-bytes 
Handle 64-bit integer values in parse_bytes
 2016-01-18 14:37:34 -08:00
Pavel Kravchenko 84a72f49e9 Add HttpHeaders support in load_config 
Signed-off-by: Pavel Kravchenko <kpavel@il.ibm.com>
 2016-01-18 14:29:31 -08:00
Joffrey F cd66f6c6cd parse_bytes: Add ability to handle 64-bit integers in py2 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-18 13:53:52 -08:00
Joffrey F f9b04c1026 Improve host devices support 
Add unit tests for utils.parse_devices
Rewrite documentation
Support dict and string format for device declaration

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-18 11:38:32 -08:00
Aanand Prasad 21a5a0a049 Normalise/fix networking API JSON keys 
- Use CamelCase
- `auxaddresses` -> `AuxiliaryAddresses`

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-18 18:41:18 +00:00
Aanand Prasad d00a5bb086 Implement support for network-scoped aliases 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-14 18:19:35 +00:00
Aanand Prasad 62d9964cc1 Merge pull request #818 from rmb938/patch-1 
allow custom ipam options when creating networks
 2016-01-05 12:55:45 +00:00
Ryan Belgrave 67a29441c4 allow custom ipam options when creating networks 
Signed-off-by: Ryan Belgrave <rmb1993@gmail.com>
 2016-01-04 18:57:11 -05:00
wenchma c424148853 Update docker network inspect test 
This is based on https://github.com/docker/docker/pull/18928

Related to docker/docker#18626

Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
 2015-12-30 10:43:02 +08:00
Joffrey F 8b322aea2b Don't expect non-zero exit code when stopping a container 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2015-12-23 13:01:05 -08:00
Aanand Prasad 9deffc45a1 Merge pull request #863 from thomasboyt/fast-exclude-paths 
Don't descend into ignored directories when building context
 2015-12-16 16:59:12 +00:00
Aanand Prasad 25b188440a Treat 'index.docker.io' repo names as 'docker.io' 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-12-10 12:42:54 +00:00
Aanand Prasad 9b890c4540 Refactor resolve_authconfig tests 
The structure of the fake config dictionary was not reflective of what
actual parsed config looks like.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-12-10 12:42:54 +00:00
Sumit Sahrawat 2981d013a5 Fix remove_volume return value 
Signed-off-by: Sumit Sahrawat <sumit.sahrawat.apm13@iitbhu.ac.in>
 2015-12-10 10:29:11 +05:30
Sumit Sahrawat bd948be7d9 Allow providing options when creating networks 
Following the spec:

    http://docs.docker.com/engine/reference/api/docker_remote_api_v1.21/#create-a-network

I have added an Options argument to create_network.

This opens up the possibility of creating isolated containers with no
internet access programmatically. We require such facilities in
https://github.com/jupyter/tmpnb/issues/187.

Signed-off-by: Sumit Sahrawat <sumit.sahrawat.apm13@iitbhu.ac.in>
 2015-12-10 10:29:11 +05:30
Joffrey F 0f091747ec Merge pull request #868 from jstewmon/config-stop-signal 
added stop_signal to create container config
 2015-12-08 12:47:31 -08:00
Thomas Boyt a49166abf2 Improve get_paths performance by not descending into ignored directories 
Signed-off-by: Thomas Boyt <thomas@ledgerx.com>
 2015-12-08 11:26:25 -05:00
Dustin Falgout e0c6ec0343 incorporate feedback 
Signed-off-by: Dustin Falgout <dustin@falgout.us>
 2015-12-04 01:27:44 -06:00
Dustin Falgout e0365fcbfb Use new methods to raise exceptions in create_host_config. 
Added tests for the new methods.
Closes #840

Signed-off-by: Dustin Falgout <dustin@falgout.us>
 2015-12-03 17:19:59 -06:00
Jonathan Stewmon 31b1b53f7f added stop_signal to create container config 
Signed-off-by: Jonathan Stewmon <jstewmon@rmn.com>
 2015-12-03 14:31:51 -06:00
Tomas Tomecek a9a538abaf allow interactive exec 
Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
 2015-12-03 11:07:11 +01:00
Tomas Tomecek 55b67acb5b tests,integration: ensure container is removed if start fails 
Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
 2015-12-02 09:46:02 +01:00
Nicolas Delaby 05fd8dfb41 fix typo filter param for `volumes` 
https://docs.docker.com/engine/reference/api/docker_remote_api_v1.21/#list-volumes

Signed-off-by: Nicolas Delaby <nicolas.delaby@lock8.me>
 2015-12-01 15:06:01 +01:00
Joffrey F 00c0baf40f Add tests for new cases covered by parse_repository_tag 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2015-11-24 12:16:00 -08:00
Joffrey F 6d0e2d69d5 Update auth.resolve_repository_name 
More relaxed version that matches the constraints imposed by the
current version of the docker daemon.
Few unit tests to verify the new cases.
Client.pull was trying to set the tag value when it wasn't supposed
to, fixed now.
utils.parse_repository_tag is simpler and supports @sha... notation

Signed-off-by: Joffrey F <joffrey@docker.com>
 2015-11-23 18:43:02 -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 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 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
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
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 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
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 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 51d2125c59 Pull correct version of busybox in integration tests 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2015-10-14 17:37:45 -07:00
Stephen Moore 7f3692ceed Fix attach method over SSL connections 
Signed-off-by: Stephen Moore <stephen@delfick.com>
 2015-10-14 17:29:31 -07:00
Joffrey F b1f25317de Use DOCKER_CONFIG environment variable to look up auth config 
When provided, default paths are ignored.

Signed-off-by: Joffrey F <joffrey@docker.com>
 2015-10-14 17:26:50 -07:00
Joffrey F a3a345e2f6 Use url-safe base64 when encoding auth header 
+ regression test

Signed-off-by: Joffrey F <joffrey@docker.com>
 2015-10-14 17:26:50 -07:00
Joffrey F 147df4d21f put/get archive implementation 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2015-10-14 17:26:50 -07:00
Joffrey F 55a0783f4b Fix tests 
Skips were masking some errors / compatibility issues

Signed-off-by: Joffrey F <joffrey@docker.com>
 2015-10-14 17:26:50 -07:00
Aanand Prasad 53589e5f0a Implement methods for managing networks 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-10-14 17:26:50 -07:00
Joffrey F a1393ee8ac Don't break when volume binds contain unicode characters 
Also includes a few unit tests for utils.convert_volume_binds

Signed-off-by: Joffrey F <joffrey@docker.com>
 2015-10-14 17:26:50 -07:00
Viacheslav Boiko 4a2db828b4 Support the 'since' option in the 'containers/<id>/logs' endpoint 
Signed-off-by: Viacheslav Boiko <v.e.boyko@gmail.com>
 2015-10-02 06:19:06 +00:00
Mazz Mosley 7ed8eb5da9 Remove skip test 
It has been reported that the bug in docker has now been fixed so we can
re-instate this test.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-10-01 14:19:34 +01:00
Paul Bellamy 19291ee20d Fix race condition in integration regression tests 
`docker port` and inspect do not return ports for containers which are
not running. Because the container command is `true`, sometimes that
exits before the inspect is called.

Signed-off-by: Paul Bellamy <paul.a.bellamy@gmail.com>
 2015-10-01 14:05:50 +01:00
Joffrey F 7884ab9fe2 Merge pull request #789 from PierreF/top_ps_args 
Allow to specify ps_args when listing processes
 2015-09-28 14:36:08 -07:00
Joffrey F d0ccc2e261 Support explicit protocol in Client.port 
User can now specify a protocol in Client.port using the port/proto
syntax. Default port is now TCP instead of UDP (to match the
behavior of `docker port`) when no proto is specified.
Regression test

Signed-off-by: Joffrey F <joffrey@docker.com>
 2015-09-28 12:06:10 -07:00
Pierre Fersing c1577606be Added test for "top" function 
Signed-off-by: Pierre Fersing <pierre.fersing@bleemeo.com>
 2015-09-28 11:59:25 +02:00
Aanand Prasad 29b12cf007 _url can take arbitrarily many arguments 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-09-25 14:25:00 -07:00
Joffrey F d89b2a01f0 cpu_quota and cpu_period unit tests 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2015-09-24 10:08:02 -07:00
Joffrey F 48d72f6703 Bump default API version 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2015-09-23 11:35:57 -07:00
Joffrey F da2b797323 Improve volume bindings integration test 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2015-09-22 14:30:03 -07:00
Joffrey F d6a86e1d69 Fix volumes tests for API version >= 1.20 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2015-09-22 14:17:19 -07:00
Aanand Prasad eec0465832 Make volume binds tests work on any host 
Instead of creating the test directory directly on the host, create it
by starting a container with the directory bind-mounted, so that it
doesn't matter whether the daemon is local, in a VM or remote.

This removes the need to make /tmp a volume in the test container, and
to share it with the dind container.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-09-22 11:34:49 -07:00
Aanand Prasad 3d6c91b469 Only pull busybox in integration tests if we don't already have it 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-09-22 14:25:28 +02:00
Joffrey F ef0c373f14 Pin busybox version to use in integration tests 
Removed obsolete non-streaming build test

Signed-off-by: Joffrey F <joffrey@docker.com>
 2015-09-21 15:34:10 -07:00
Joffrey F 8d32631635 Improve volume cleanup logic 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2015-09-16 12:55:49 -07:00
Joffrey F acd5e634ff Generic skip decorator for low API version accessible to all tests 
Add simpler version comparison functions
Add decorator to enforce minimum version in API methods
Fix utils imports
Add minimum_version decorators on API methods that needed it
GroupAdd test requires API version >= 1.20

Signed-off-by: Joffrey F <joffrey@docker.com>
 2015-09-16 12:55:13 -07:00
Joffrey F 05267f63d3 Modify unit tests suite to allow mock routes to optionally be method-aware 
Added mock API routes for volumes API
Add unit tests and integration tests for volume API

Signed-off-by: Joffrey F <joffrey@docker.com>
 2015-09-16 12:54:26 -07:00
Joffrey F 1b798a2901 GroupAdd tests 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2015-09-15 01:58:06 +02:00
Maxime Petazzoni e5fbc42dcb Merge pull request #763 from docker/api_splitup 
API splitup
 2015-09-13 08:47:07 -07:00
Joffrey F c735cc69a0 Split different APIs into several mixins for clarity / easier maintenance 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2015-09-11 16:19:29 -07:00
Joffrey F 7e3cdfb3b1 Fixed regression test in py3 environments 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2015-09-10 11:37:51 -07:00
Joffrey F de5aab87b4 Merge pull request #753 from docker/715-user-int-uid 
Always send a string for the user param in create_container
 2015-09-10 10:37:05 -07:00
Joffrey F b1c2475698 Add hello-world to temp images in pull tests 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2015-09-09 17:10:04 -07:00
Joffrey F 1fb2db4951 Make integration tests more CI-friendly. 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2015-09-09 17:06:34 -07:00
Joffrey F fa3082b6cd Update integration-dind task 2015-09-09 14:49:58 -07:00
Joffrey F abaf346b49 Make running integration tests with dind possible 2015-09-09 14:49:36 -07:00
Joffrey F 7dce129180 Merge pull request #754 from aanand/default-to-tcp-url-on-windows 
Default to 127.0.0.1:2375 on Windows
 2015-09-01 16:36:32 -07:00
Aanand Prasad 1362938f03 Default to 127.0.0.1:2375 on Windows 
Following the logic of the Docker client.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-09-01 16:28:05 -07:00
Joffrey F 1e916a1e83 Test UID validity 2015-08-31 18:35:32 -07:00
Joffrey F 09defa66ba Always send a string for the user param in create_container 2015-08-31 16:06:52 -07:00
Joffrey F 3d884f9a3c Test URL construction 2015-08-31 15:01:40 -07:00
Joffrey F 33acb9d2e0 Test has been fixed, remove skip decorator 2015-08-31 13:13:46 -07:00
Joffrey F ad608baaaf Merge pull request #747 from aanand/integration-test-fixes 
Integration test improvements
 2015-08-31 13:07:02 -07:00
Aanand Prasad 6c0f7187a8 Integration test improvements 
- Fix the setup step (the process has changed now that we're using
  pytest)

- Skip tests that are unstable

- Make better use of build caching

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-08-31 12:06:41 -07:00
Joffrey F 9b37120167 Merge pull request #742 from aanand/fix-dockerignore-integration-test 
Fix .dockerignore integration test
 2015-08-27 11:01:47 -07:00
Joffrey F 63df0b9ab3 Merge branch 'master' of github.com:docker/docker-py 2015-08-26 17:02:55 -07:00
Joffrey F c56c9faacd Merge branch 'default-cert-path' of https://github.com/aanand/docker-py into aanand-default-cert-path 
Conflicts:
	tests/utils_test.py
 2015-08-26 17:00:33 -07:00
Joffrey F db1a93fd27 Merge pull request #662 from stevenewey/exec_create_user 
Exec create user
 2015-08-26 15:36:47 -07:00
Joffrey F ddf879cc4c Merge pull request #721 from aanand/pathspec 
Better support for .dockerignore
 2015-08-26 14:25:09 -07:00
Joffrey F e7a9ae097c Don't remove LogConfig.types shortcut 2015-08-26 11:51:08 -07:00
Aanand Prasad 20e142fe78 Better support for .dockerignore 
- Support all basic pattern forms: file, directory, *, ?, !

- Fix handling of wildcard patterns and subdirectories - `*/a.py` should
  match `foo/a.py`, but not `foo/bar/a.py`

- Fix handling of directory patterns with a trailing slash - make sure
  they're handled equivalently to those without one

- Fix handling of custom Dockerfiles - make sure they go in the tarball

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-08-26 19:14:09 +01:00
Mazz Mosley 9937a31a88 Test valid no args for log config 
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-08-26 16:10:28 +01:00
Aanand Prasad ced9b0094f Fix .dockerignore integration test 
- There was a typo (".dockerginore"), which meant that the exclusion of
  the .dockerignore file itself wasn't being tested.

- Some of the file names were non-descriptive.

- The test was inspecting the output of the build process, rather than
  running 'ls' in a new container, which meant it was full of extra
  output, and would fail when there was a cache hit.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-08-26 16:03:21 +01:00
Mazz Mosley 35b30e69df Remove validation of supported log drivers 
By having this hardcoded list of log drivers, it is a bottleneck
to us supporting more log drivers.

The daemon already validates if a log driver is valid or not, so rather
than duplicating that validation, let's pass the log_driver along.

This allows support for new/more log drivers as they become supported
in docker without having to wait for both docker-py and docker-compose
to support them.

Keeping the current list of log driver types for backwards compatibility.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-08-26 16:02:03 +01:00
Mazz Mosley 90538cf0a3 Fix log driver integration test 
By using `json-file` as the use case we can run this without needing
to be on a machine with syslog installed.

Even if syslog was installed, this test was still failing as the
`log_opt` of 'key1' is an invalid option.

This test is slightly different style to the others, it hopefully
includes an example of how to space out tests for increased readability,
we construct our tests in 3 phases(generally) and include a space imbetween
them:

- setup

- perform action

- assertions

Expanded variable names is important for readability/clarity. Also
reduced the number of assertions to focus on the logic we're testing.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-08-26 15:58:57 +01:00
Joffrey F b5f1e64e8f Ensure Makefile still run tests properly / tests are run in container as expected 2015-08-25 16:58:01 -07:00
Joffrey F f9a540aa77 Merge branch 'pytest' of https://github.com/aanand/docker-py into aanand-pytest 2015-08-25 16:10:47 -07:00
Joffrey F 47e0ad6959 Merge pull request #735 from aanand/test-network-mode-version 
Explicitly test NetworkMode logic in create_host_config
 2015-08-25 14:57:59 -07:00
Joffrey F 1308049d2f Merge pull request #736 from aanand/propagate-exceptions-in-tests 
Stop catching Exception in tests where it isn't expected
 2015-08-25 14:56:49 -07:00
Aanand Prasad d5bcdaf2f8 Use pytest helpers to assert exceptions and deprecated warnings 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-08-25 16:34:33 +01:00
Aanand Prasad 6e27c2a3d0 Run tests with pytest 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-08-25 16:34:33 +01:00
Bryan Boreham 4e4c342582 Call Client.create_host_config because the old call is deprecated 
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2015-08-25 16:19:51 +01:00
Aanand Prasad 36424ca001 Stop catching Exception in tests where it isn't expected 
The test runner will report on the exception anyway, so it's redundant.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-08-25 16:00:42 +01:00
Aanand Prasad 41c21676a2 Explicitly test NetworkMode logic in create_host_config 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-08-25 14:11:21 +01:00
Aanand Prasad d9a149f327 Merge pull request #732 from docker/version-dependent-hostconfig 
Version dependent hostconfig
 2015-08-25 14:03:51 +01:00
Colin Huang edebf3756a Split the entrypoint string to shell-like syntax. 2015-08-25 09:44:47 +08:00
Joffrey F 595965ebc4 Adapt tests to new create_host_config usage 2015-08-24 16:25:18 -07:00
Mohit Soni 3caaa0050b Added support for cgroup parent 
Clean up cgroup_parent usage
 2015-08-24 14:43:05 -07:00
Mark Adams b7aa1d76eb Fixed #726 issue where split_port was checking `len(None)` 
- Fixed #726 by adding a check for None in split_port
- Also switched to using a _raise_invalid_port() function to replace
  multiple slightly differing ValueErrors for invalid port
 2015-08-19 22:01:44 -05:00
Joffrey F adb2d01861 Added full path parse_host unit test 2015-08-17 14:45:35 -07:00
Stephen Newey 1c1d7eee5a Merge branch 'master' into exec_create_user 2015-08-12 18:12:56 +01:00
Joffrey F 139850f3f3 Merge pull request #698 from docker/jhowardmsft-14530-netmode 
`network_mode` now necessary in `host_config`
 2015-08-10 10:53:57 -07:00
Viktor Petersson d400717ff8 Squashed commit of the following: 
commit 4f053a06c1e9e3f63fd5afde60322f676acbdf45
Merge: 9177380 07a99ea
Author: Viktor Petersson <vpetersson@wireload.net>
Date:   Thu Jul 30 14:37:16 2015 +0100

    Merge branch 'master' into fixes

commit 9177380ae9abf4ca01cf7a2a8b7de6640ed5f5d5
Author: Viktor Petersson <vpetersson@wireload.net>
Date:   Thu Jul 30 14:00:51 2015 +0100

    Tweaks exception message.

commit 6a5832e2f6655835a6b87897d7ec82d6ef5faa50
Author: Viktor Petersson <vpetersson@wireload.net>
Date:   Thu Jul 30 13:17:32 2015 +0100

    Simplifies logic as per feedback.

commit f750eddc34e5356dcfb53c16a7f98a99e817fa53
Author: Viktor Petersson <vpetersson@wireload.net>
Date:   Thu Jul 30 11:09:14 2015 +0100

    Move return from list to dict. Adds exception handling.

commit 8e50f57cceb6370b7f7b41624f50d5a6835301a0
Author: Viktor Petersson <vpetersson@wireload.net>
Date:   Thu Jul 30 10:15:58 2015 +0100

    Reverts change to .gitignore.

commit 5ba2c1b29706ddb74bef9c24c2a6e64bb369db22
Author: Viktor Petersson <vpetersson@wireload.net>
Date:   Wed Jul 29 21:15:21 2015 +0100

    Fixes feedback. Adds three unittests.

commit e1c719e61993fdaec0f22ba0de706af80587dc16
Author: Viktor Petersson <vpetersson@wireload.net>
Date:   Wed Jul 29 17:00:16 2015 +0100

    WIP Adds test for parse_env_file

commit 4448ae72e55d889d9d194a2c0303d182cb157d4c
Author: Viktor Petersson <vpetersson@wireload.net>
Date:   Wed Jul 29 16:42:49 2015 +0100

    Excludes coverage files.

commit 19a5d01615dd9b7ee939f54f256e5bae89a94ee1
Author: Viktor Petersson <vpetersson@wireload.net>
Date:   Wed Jul 29 16:42:42 2015 +0100

    Switch fixes logic.

commit a8094c63a9f4351ae71393ea5603aa11c5c5bc94
Author: Viktor Petersson <vpetersson@wireload.net>
Date:   Wed Jul 29 11:45:56 2015 +0100

    Implements logic for envfile parsing from Docker-cli

    Ref: https://github.com/docker/docker/blob/master/opts/envfile.go#L19-L51

commit ea9bfd95dfafe4023c58ab37f990158f73eb2e0d
Author: Viktor Petersson <vpetersson@wireload.net>
Date:   Wed Jul 29 11:41:23 2015 +0100

    Replaces CSV module with manual splitting.

commit a001d28ff48309d2b2338aaf27253fdfaa0f6c4b
Author: Viktor Petersson <vpetersson@wireload.net>
Date:   Wed Jul 29 11:35:37 2015 +0100

    Removes isinstance on filename.

commit 419d5961f6103df9166be3a9baa549276c12223d
Author: Viktor Petersson <vpetersson@wireload.net>
Date:   Tue Jul 28 22:39:33 2015 +0100

    Reflects @aanand's feedback.

commit e81e3c8ed797ff939843d2485bf15525e85e890d
Author: Viktor Petersson <vpetersson@wireload.net>
Date:   Tue Jul 28 15:43:32 2015 +0100

    Typo fix.

commit 2898389cada2bfca64bdfa71359aebeb3b5b6d1b
Author: Viktor Petersson <vpetersson@wireload.net>
Date:   Tue Jul 28 15:41:08 2015 +0100

    Refs #565. Adds minimal implementation of env_file client-side support.
 2015-07-30 14:39:37 +01:00
Joffrey F 2b7c31e0f7 Fixed empty_host_config test 2015-07-29 14:23:10 -07:00