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

604 Commits

Author SHA1 Message Date
Joffrey F 25db440c96 Update arguments for several Swarm API methods 
Add Client.update_swarm method
Add test for Client.update_swarm

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-08-04 15:11:13 -07:00
Joffrey F 1f055796a8 Add new init_swarm test with custom spec 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-08-03 18:00:29 -07:00
Joffrey F 07563cfe3f Update swarm methods to include newly added parameters 
Rename swarm methods to be more explicit
Utility methods / types to create swarm spec objects

Integration tests

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-08-03 16:58:26 -07:00
Joffrey F 9d48b4f603 Test fixes and updated Makefile for 1.12 testing 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-08-03 16:48:41 -07:00
Joffrey F ae7cb4b99f Avoid crashing in update_headers decorator when headers kwarg is None 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-08-02 17:25:50 -07:00
Jari Takkala dec29e1c10 Add support for sysctl when creating container 
Closes #1144

Signed-off-by: Jari Takkala <jtakkala@gmail.com>
 2016-08-01 23:43:52 +01:00
Joffrey F 723d144db5 Add support for IPv6 docker host connections. 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-07-27 18:42:14 -07:00
Aanand Prasad 0e68b0a429 Default to npipe address on Windows 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-26 11:39:09 +01:00
Joffrey F cea7376086 Send LinkLocalIPs as part of IPAMConfig dictionary 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-07-25 15:04:04 -07:00
Keerthan Reddy Mala 1294d3c410
Add unit tests 
Signed-off-by: Keerthan Reddy Mala <kmala@deis.com>
 2016-07-22 10:04:32 -06:00
Ben Firshman bd73225e14
Set custom user agent on client 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-07-20 15:04:54 -07:00
Aanand Prasad 267021e453 Rename read methods for clarity 
read_socket() is now just read(), because its behaviour is consistent
with `os.read` et al.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-13 18:58:57 -04:00
Aanand Prasad 9fb2caecb9 Rename next_packet_size to next_frame_size 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-13 17:08:17 -04:00
Aanand Prasad 73f06e3335 Move socket-reading test helpers into docker.utils.socket 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-13 17:08:17 -04:00
Joffrey F e64ba8f2b9 Mock read_from_socket method 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-07-13 17:08:17 -04:00
Joffrey F 76ed9c37cd Read from socket after sending TCP upgrade headers. 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-07-13 17:08:17 -04:00
David Gageot 5464cf2bea Add hijack hints for non-detached exec api calls 
Signed-off-by: David Gageot <david@gageot.net>
 2016-07-13 17:08:17 -04:00
Tomas Tomecek 8f8a3d0ed2 volumes,create: support adding labels 
Fixes #1102

Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
 2016-07-13 08:41:45 +02:00
Justin Michalicek e8ea79dfdb Change double underscore in test case names for _set_auth_headers 
* Change test__set_auth_headers_* methods to test_set_auth_headers_*

Signed-off-by: Justin Michalicek <jmichalicek@gmail.com>
 2016-07-12 10:06:34 -04:00
Justin Michalicek f7807bdb52 Update build unit tests 
* Test that the request from build when the client has
  auth configs contains the correct X-Registry-Config header
* Test that BuildApiMixin._set_auth_headers() updates the passed
  in headers dict with auth data from the client
* Test that BuildApiMixin._set_auth_headers() leaves headers dict intact
  when there is no _auth_config on the client.

Signed-off-by: Justin Michalicek <jmichalicek@gmail.com>
 2016-07-12 10:06:34 -04:00
Srikalyan Swayampakula b5d3556bce Added support for user namespace. 
Signed-off-by: Srikalyan Swayampakula <srikalyansswayam@gmail.com>
 2016-06-30 15:25:17 -07:00
Joffrey F d96d848bb4 Add integration tests for different types of kill signals 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-06-28 12:03:44 -07:00
Joffrey F 1132368be1 Fix network aliases test with Engine 1.12 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-06-28 11:05:01 -07:00
Joffrey F 538a1db9dd Merge pull request #1066 from yunzhu-li/blkio-control 
Add support for Block IO constraints in HostConfig
 2016-06-15 14:26:49 -07:00
Joffrey F 787f3f5a16 Merge pull request #1079 from docker/1024-npipe-support 
npipe support
 2016-06-14 12:05:35 -07:00
Joffrey F b6fa986293 Add ipv[46]_address params to create_endpoint_config. 
Update networks documentation with exhaustive API docs

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-06-13 17:58:10 -07:00
Massimiliano Pippi 86d1b8fb83 invoke self._result with json=True if decode=True 
Signed-off-by: Massimiliano Pippi <massi@datadoghq.com>
 2016-06-07 10:32:02 -04:00
yunzhu-li 896d36ea1d
Add support for Block IO constraints in HostConfig 
This adds support for Block IO constraint options:
    - blkio-weight
    - blkio-weight-device
    - device-read-bps
    - device-write-bps
    - device-read-iops
    - device-write-iops

Signed-off-by: yunzhu-li <contact@yunzhu.li>
 2016-06-05 23:30:44 -04:00
Joffrey F 0176fa171f Update parse_host and tests 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-06-02 18:21:29 -07:00
Thomas Grainger e0b9cb2a8c
support Python 3.5 
Signed-off-by: Thomas Grainger <tom.grainger@procensus.com>
 2016-05-19 17:59:34 +01:00
Jonathan Giannuzzi 98b41fee3c Add support for creating internal networks 
Signed-off-by: Jonathan Giannuzzi <jonathan@giannuzzi.be>
 2016-05-18 16:25:43 +02:00
Aanand Prasad 5ebf4b8ec7 Resolve path traversal in .dockerignore patterns 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-05-16 15:55:06 +01:00
Kevin Frommelt 2826dd51e7 Don't set socket timeout if it's already disabled when streaming 
Signed-off-by: Kevin Frommelt <kevin.frommelt@gmail.com>
 2016-05-10 10:23:14 -05:00
Joffrey F 3c02fc4cc7 Merge pull request #1004 from klj613/allow-equals-character-in-env-file 
makes it possible to have '=' in the env file
 2016-04-27 16:27:28 -07:00
Felix Yan 9da5493135 Use backports.ssl_match_hostname 
The py2-ipaddress module unfortunately conflicts with the pypi:ipaddress module, which is in the dependency tree of widely used pyOpenSSL. I think it would be a good idea to use a well maintained backport of the Python 3.5 implementation of match_hostname() instead of duplicating the effort and maintain another.

All tests are passing here.

Signed-off-by: Felix Yan <felixonmars@archlinux.org>
 2016-04-08 00:36:46 +08:00
Joffrey F 541edd7ffb Don't raise InvalidConfigError when auth dict doesn't have an 'auth' key 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-04-05 14:05:33 -07:00
Joffrey F c5a92e0822 Tests for match_hostname backport 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-29 17:09:26 -07:00
Joffrey F cf83119882 Test commit changes param 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-23 12:17:22 -07:00
Joffrey F 9505b3e8b5 Merge branch 'master' of https://github.com/dimaspivak/docker-py into dimaspivak-master 2016-03-23 12:04:09 -07:00
Joffrey F 14cc5806c5 Merge branch 'gferon-master' 2016-03-23 12:02:31 -07:00
Joffrey F 7b17cfaa46 check_duplicate test 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-23 12:01:56 -07:00
Joffrey F ec05d5d2c0 gzip build test 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-23 11:23:05 -07:00
Joffrey F c3f76e6e8f Merge branch 'from_env' of https://github.com/bfirsh/docker-py into bfirsh-from_env 2016-03-22 17:09:24 -07:00
Aditya Marella 7a0e19766b Support OomScoreAdj in host configuration 
Signed-off-by: Aditya Marella <aditya.marella@gmail.com>
 2016-03-22 10:54:59 -07:00
Kristian Lewis Jones 6eaf8ce721 makes it possible to have '=' in the env file 
note that the docker command line flag --env-file also allows '=' in the env file

Signed-off-by: Kristian Lewis Jones <klj613@kristianlewisjones.com>
 2016-03-22 10:00:47 +00:00
Joffrey F 3fe08cbfe5 Support passing an alternate environment dict to kwargs_from_env 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-21 18:17:27 -07:00
Dima Spivak 99b6ec1180 Add support for changes param to ContainerApiMixin.commit 
docker commit --changes was added to Docker in 1.6.0.

Signed-off-by: Dima Spivak <dima@spivak.ch>
 2016-03-21 11:37:14 -07:00
wenchma 6fa76e01a4 Remove the network mode to support linkable cantainers check 
Partially related to issue #21080

Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
 2016-03-21 10:25:08 +08:00
Joffrey F 3168149cbf If tcp host is provided while TLS is enabled, convert to https 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-17 16:18:37 -07:00
Joffrey F 41acd70fd4 Merge pull request #995 from docker/default-version-1.22 
Update default API version to 1.22
 2016-03-16 19:55:42 -07:00
Joffrey F 5ace6204b4 Update default API version to 1.22 
Update engine version used for integration tests

IP address configuration tests needed tweaking

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-16 17:52:39 -07:00
Aanand Prasad 7417bc2cce Don't support tmpfs in API version < 1.22 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-03-16 17:37:54 +00:00
Aanand Prasad 4ffa1be825 Add tmpfs integration test 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-03-16 17:28:10 +00:00
Jan Losinski 72446b47c0 Add unittest for the Tmpfs Hostconfig option 
Signed-off-by: Jan Losinski <losinski@wh2.tu-dresden.de>
 2016-03-16 14:47:40 +00:00
Ben Firshman 8991ba7cce Add docker.from_env() shortcut 
A much neater way of getting started with docker-py.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-03-15 11:24:25 -07:00
Joffrey F 8e93abf271 Merge branch 'master' into tls-fixes 2016-03-15 10:35:53 -07:00
Joffrey F d4c17859a3 Invalid log driver error raised during create_container step 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-14 15:05:47 -07:00
Joffrey F ad480ff0b1 Fix enable_tls issue #984 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-11 12:27:24 -08:00
Matt Daue d4a5bc4a86 Add ip4&ip6 (#935) support, network/id/connect 
Signed-off-by: Matt Daue <mattdaue@gmail.com>

- Implement check to validate API ver is >= 1.22 for new feature
- Includes patch @elchris82: Changed network in data dict to IPAMConfig as needed from the API. See https://github.com/docker/docker/issues/20732
- Update unit test for container attach to net
- Update integration tests
- Add integration test for IP setting

Signed-off-by: Matt Daue <mattdaue@gmail.com>
 2016-03-02 20:38:37 -05:00
Joffrey F 81d8caaf36 Merge pull request #916 from docker/container_update_feature 
Support for container limits update
 2016-02-24 18:00:06 -08:00
Joffrey F cdf6dc8c3c Merge pull request #942 from seguins/934-separate-stream-follow-logs 
Separate params stream and follow for logs.
 2016-02-24 16:04:42 -08:00
Daniel Nephin 3bad04649d Fix env vars with empty values. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2016-02-24 15:36:21 -08:00
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