Commit Graph

508 Commits

Author SHA1 Message Date
Joffrey F 97094e4ea3 New docker.types subpackage containing advanced config dictionary types
Tests and docs updated to match
docker.utils.types has been moved to docker.types

Signed-off-by: Joffrey F <joffrey@docker.com>
2016-08-19 16:51:13 -07:00
Joffrey F 02e99e4967 Service API integration tests
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-08-17 18:42:52 -07:00
Brian Goff 0f47db7fcc Remove references to "ExecutionDriver"
Docker no longer has an `ExecutionDriver` as of Docker 1.11.
The field in the `docker info` API will not be present in 1.13.

Found this while working on docker/docker#25721

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-08-17 12:20:13 -07:00
Tomas Tomecek 3062ae4348 docker client consistency: don't quote ':/'
E.g.

docker client

`/v1.21/images/localhost:5000/busybox/push?tag=`

docker-py

`/v1.21/images/localhost%3A5000%2Fbusybox/push`

Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
2016-08-17 12:20:13 -07:00
Joffrey F a75553b3ca Add `nodes` and `inspect_node` methods
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-08-11 17:47:02 -07:00
Joffrey F 0f70b6a38b Add support for custom name in SwarmSpec
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-08-04 16:48:21 -07:00
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
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
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