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

1036 Commits

Author SHA1 Message Date
Joffrey F a6fb7a2064 Re-add docker.utils.types module for backwards compatibility 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-09 16:50:03 -07:00
Joffrey F 72e7afe17a dev version 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-09 16:43:54 -07:00
Joffrey F 3eb93f6662 Bump version 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-08 12:00:25 -07:00
Joffrey F e6601e2e55 Remove default adapters when connecting through a unix socket. 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-08 11:20:48 -07:00
Joffrey F 0430d00f2f Handle bufsize < 0 in makefile() as a substitute for default 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-07 17:49:07 -07:00
Joffrey F 65fb5be4cd Add support for changes param in import_image* methods 
Reduce code duplication in import_image* methods

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-06 15:38:44 -07:00
Joffrey F 219a8699f9 Better credentials store error handling in resolve_authconfig 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-06 15:17:36 -07:00
Joffrey F fbe1686e62 Add credentials store support 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-06 15:17:36 -07:00
Ben Firshman 3769c089e8
Fix licenses 
* Complete main LICENSE
* Remove unnecessary licenses from individual files

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-09-05 17:48:09 +02:00
Joel Martin 9799c2d69b Fix Mount bind type sanity check 
any() expects a single collection argument, not a list of arguments.

Signed-off-by: Joel Martin <github@martintribe.org>
 2016-09-02 15:32:52 -05:00
Joffrey F 6552076856 Add support for force disconnect 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-08-31 18:44:36 -07:00
Joffrey F a665dfb375 Add support for labels and enable_ipv6 in create_network 
Tests + docs

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-08-31 18:26:16 -07:00
Joffrey F 24bfb99e05 Merge pull request #1167 from docker/1075-from-env-version 
Support version parameter in `Client.from_env`
 2016-08-25 14:59:46 -07:00
Joffrey F 764d7b38c4 Support version parameter in `Client.from_env` 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-08-25 14:44:13 -07:00
Joffrey F 2ef02df2f0 Merge pull request #1168 from docker/aiden0z-master 
Support pids_limit in HostConfig
 2016-08-25 14:38:22 -07:00
fermayo 5bedd32a69 Fix creating containers with env vars with unicode characters 
Signed-off-by: Fernando Mayo <fernando@docker.com>
 2016-08-25 13:36:02 +02:00
Joffrey F bf2235bc12 Merge branch 'master' of https://github.com/aiden0z/docker-py into aiden0z-master 2016-08-23 17:02:40 -07:00
Joffrey F fb41965272 Merge pull request #1082 from masci/fix_stream_helper 
Invoke self._result passing `json=True` when `decode=True`
 2016-08-23 15:34:35 -07:00
Kay Yan fc72ac66e9 support MemoryReservation and KernelMemory 
Signed-off-by: Kay Yan <kay.yan@daocloud.io>
 2016-08-23 15:32:06 -07:00
Joffrey F 797f1edc20 Merge branch 'master' of https://github.com/srikalyan/docker-py into srikalyan-master 2016-08-23 15:16:15 -07:00
Joffrey F 0e4314a872 Merge branch 'jp-cpushares' of https://github.com/joshpurvis/docker-py into joshpurvis-jp-cpushares 2016-08-23 15:12:30 -07:00
Joffrey F abd461150a Merge pull request #1081 from tescalada/master 
1059-Fixing a bug with multiple json objects
 2016-08-23 15:10:56 -07:00
Joffrey F 0acdd19665 Merge pull request #1131 from Knetic/dnsopts 
Implemented dns_opt support (from api 1.21)
 2016-08-23 15:04:25 -07:00
Joffrey F 775b581c04 Private images support in create_service / update_service 
Refactor auth header computation

Add tasks methods and documentation.

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-08-23 14:52:07 -07:00
Joffrey F f53cdc3a07 Rename LogDriver to DriverConfig for genericity 
The class can be used for both log driver and volume driver specs. Use
a name that reflects this.

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-08-22 16:11:48 -07:00
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
Joffrey F 172e95d52f Swarm service API implementation 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-08-17 12:21:34 -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
Josh Purvis 7d147c8ca1 Move cpu_shares and cpuset_cpu to HostConfig when API >= 1.18 
Signed-off-by: Josh Purvis <joshua.purvis@gmail.com>
 2016-08-15 16:33:58 -04: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
Tomas Tomecek 08b284ab39 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-10 09:30:19 +02:00
George Lester 93b4b4134e Implemented dns_opt support (from api 1.21) 
Signed-off-by: George Lester <glester491@gmail.com>
 2016-08-07 14:23:22 -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
minzhang 9fdc8d476d Added support for docker swarm api version 1.24. 
3 API are added
swarm_init()
swarm_leave()
swarm_join()

Signed-off-by: Min Zhang <virgilerin@gmail.com>

Signed-off-by: Min Zhang <virgilerin@gmail.com>
 2016-08-03 16:57:44 -07:00
minzhang 44868fa0fa Added support for docker swarm api version 1.24. 
3 API are added
swarm_init()
swarm_leave()
swarm_join()

Signed-off-by: Min Zhang<minzhang.work@gmail.com>

Signed-off-by: Min Zhang <virgilerin@gmail.com>
 2016-08-03 16:57:44 -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
Tristan Escalada f8b843b127 1059-Fixing a bug with multiple json objects 
This splits the text by CRLF and then json.loads each part
independently instead of attempting the parse the whole string.

Signed-off-by: Tristan Escalada <tristan@escalada.us>
 2016-08-01 11:05:32 -04:00
Aanand Prasad f006da6a43 More explicit debug for config path logic 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-08-01 14:52:39 +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
Joffrey F 2d3bda84de dev version 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-07-26 15:48:29 -07:00
Joffrey F a4a27d80f0 Merge branch 'release' 2016-07-26 15:46:51 -07:00
Joffrey F 5b1e556474 Bump to 1.9.0 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-07-26 12:11:32 -07:00
Ben Firshman ae86949188 Set custom user agent on client 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-07-26 11:57:21 -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 9b63bed6a0
Add optional auth config to docker push 
Signed-off-by: Keerthan Reddy Mala <kmala@deis.com>
 2016-07-22 10:04:31 -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 69832627f8 Rename read_iter() to frames_iter() 
This makes it more clearly high-level and distinct from the raw
data-reading functions

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-13 17:41:59 -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 456bfa1c1d Reorder socket.py methods 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-13 17:08:17 -04:00
Aanand Prasad 472a7ffce8 Remove unused imports 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-13 17:08:17 -04:00
Aanand Prasad ce2b60ecf6 Document all socket utility methods 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-13 17:08:17 -04:00
Aanand Prasad 3e2f4a6142 Refactors 
- `read_data()` raises an exception instead of asserting `False`
- `next_packet_size()` uses `read_data()`
- Renamed `packet_size` arg to `n` for consistency

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-13 17:08:17 -04:00
Aanand Prasad 43158cfe3f Move read_loop() into docker.utils.socket.read_iter() 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-13 17:08:17 -04:00
Aanand Prasad b100666a3c Remove duplicated methods from container.py 
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 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
David Gageot 6dec639a1a Add hijack hints for attach api calls 
Signed-off-by: David Gageot <david@gageot.net>
 2016-07-13 17:08:16 -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 66e7af9353 Pass X-Registry-Auth when building an image 
* Initialize headers variable in BuildApiMixin.build() as a dict rather
  than as None.  This way the correct object gets passed to
  _set_auth_headers() even if no headers were set in build()

* Changing object from None to {} in BuildApiMixin._set_auth_headers()
  removed because it changes the object reference, so has no effect on
  calling code.

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 0f15c6599d Bump to 1.9.0-rc2 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-06-28 14:54:37 -07:00
Joffrey F 900703ef2f signal in Client.kill can be a string containing the signal's name 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-06-28 13:29:37 -07:00
Joffrey F 5480493662 signal in Client.kill can be a string containing the signal's name 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-06-28 11:03:52 -07:00
Joffrey F 0de366da3d Add support for link-local IPs in endpoint config 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-06-24 15:17:58 -07:00
Aiden Luo 7d9bb6d209 fix #1094, support PidsLimit in host config 
Signed-off-by: Aiden Luo <aiden0xz@gmail.com>
 2016-06-17 11:20:39 +08:00
Joffrey F a2160145cf 1.9.0 RC1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-06-16 12:46:46 -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 fc4bfde0d6 Unify endpoint config creation when using connect_container_to_network 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-06-13 17:58:10 -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
Joffrey F a8746f7a99 Remove obsolete, commented out code 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-06-08 17:02:33 -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
Joffrey F d922713923 Reorganize docker.transport package 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-06-02 17:59:50 -07:00
Joffrey F b5d9312f9a npipe support cleanup 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-06-02 17:59:50 -07:00
Joffrey F a34e0cbfaa Experimental npipe:// support 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-06-02 17:59:50 -07:00
Thomas Grainger 98093544a7
support new Py3.5 Enum signals 
Signed-off-by: Thomas Grainger <tom.grainger@procensus.com>
 2016-05-19 18:19:33 +01: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 d6e70e2c40 Update ChangeLog and version.py (1.8.1) 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-04-28 17:15:20 -07:00
Joffrey F 5df7b317e4 Merge pull request #1050 from docker/1044-fix-login-default 
Let server-side determine which serveraddress to use when unspecified
 2016-04-28 17:07:11 -07:00
Joffrey F 50a6a47186 Let server-side determine which serveraddress to use when none is specified 
in login()

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-04-28 16:53:01 -07: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
Joffrey F 02803afac4 Add -dev suffix to version 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-04-22 15:01:58 -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 267bd34426 Bump version to 1.8.0 
Add RC bugfixes to the changelog.

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-04-05 16:21:16 -07: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 035e9e1c91 Bump RC 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-31 17:48:56 -07:00
Joffrey F b19321da9c Bump RC 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-30 17:18:04 -07:00
Joffrey F 079ed9f786 Bump RC 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-30 10:56:17 -07:00
Joffrey F a6c1d7b751 flake8 fixes 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-29 17:09:37 -07:00
Joffrey F 0a5815bcad Add match_hostname implementation and monkey-patch for py<3.5 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-29 17:08:31 -07:00
Joffrey F 88c8ed862d Update release script. Bump to rc2 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-23 13:45:39 -07:00
Joffrey F 0e1129edf9 Set version to RC1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-23 12:44:34 -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 40d8d37c65 Merge branch 'master' of https://github.com/gferon/docker-py into gferon-master 2016-03-23 11:55:02 -07:00
Joffrey F 456cfdb349 Merge pull request #972 from vitalyisaev2/master 
UnixHTTPConnectionPool initialization error
 2016-03-23 11:54:11 -07:00
Joffrey F a67f4c1ecc Make gzip encoding optional 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-22 18:14:16 -07:00
Michael Sander 9dbccce5b6 Fix line-spacing for build 
Signed-off-by: Michael Sander <michael.sander@docketalarm.com>
 2016-03-22 18:14:16 -07:00
Michael Sander b6d9af59cb Encode the tar ball with gzip 
Gzipping this tarball can greatly reduce the time it takes to send a docker file.

Signed-off-by: speedplane <mes65@cornell.edu>
 2016-03-22 18:13:56 -07:00
Michael Sander 4529dceaaf Add an option to gzip tar files. 
This can be used to make building much faster.

Signed-off-by: speedplane <mes65@cornell.edu>
 2016-03-22 18:11:50 -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
Gabriel Féron 4ee055852d Add missing CheckDuplicate parameter to /networks/create API call 
When set to True, this prevents creating more than one network with the same name (see https://docs.docker.com/engine/reference/api/docker_remote_api_v1.21/#create-a-network)

Signed-off-by: Gabriel Féron <feron.gabriel@gmail.com>
 2016-03-22 16:05:22 +01: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
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 07455a6a3c Clarify error messages when bad values are passed in for tmpfs 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-03-16 14:54:32 +00:00
Jan Losinski 9e94070887 Add support for Tmpfs declaration in Hostconfig. 
This adds support for the Tmpfs option introduced in Docker 1.10.
See: https://github.com/docker/docker/pull/13587

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 ad480ff0b1 Fix enable_tls issue #984 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-11 12:27:24 -08:00
Joffrey F b7b0fa6aff Merge branch '935' of https://github.com/mdaue/docker-py into mdaue-935 2016-03-09 14:24:54 -08:00
Vitaly Isaev 8dd9d1d66e Fix UnixHTTPConnectionPool's superclass initialization 
Signed-off-by: Vitaly Isaev <vitalyisaev2@gmail.com>
 2016-03-03 22:41:49 +03: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 f4114274d6 Use protocol TLS v1.0 by default when none is set. 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-02 15:01:30 -08:00
Aleksandar Topuzovic 08629f3b8e Use decode on push and pull operations. 
Stream helper has the ability to decode the responses from strings to
JSON. This commit enables this functionality on push and pull operations.

Signed-off-by: Aleksandar Topuzovic <aleksandar.topuzovic@gmail.com>
 2016-03-01 11:54:14 +00: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
Joffrey F 507503cdfa Merge pull request #952 from dnephin/fix_empty_env_vars 
Format environment variables to match docker-cli.
 2016-02-24 15:28:53 -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 03279ff9a3 update_container now supports string values 
for mem_limit, memswap_limit, kernel_memory and mem_reservation

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
Joffrey F aa651f80b1 Back to dev version 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-23 16:17:10 -08:00
Joffrey F 287ab93399 Prepare 1.7.2 release 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-23 15:02:11 -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
Joffrey F cc450d697c Back to dev version 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-22 18:05:05 -08:00
Joffrey F 19564e34be Bumped version to 1.7.1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-17 11:00:13 -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 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
Joffrey F bba8e28f82 Merge pull request #923 from nubs/master 
Add support for shm_size.
 2016-02-04 14:28:09 -08:00
Joffrey F 084f758212 Back to dev version 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-04 14:26: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
Joffrey F a11dc87bd3 Bump to stable version 
Update ChangeLog

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-04 09:39:02 -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 cf5755da45 Update outdated error message 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-29 17:26:10 -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
Joffrey F 446e6d08dd Bump RC 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-26 11:04:43 -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
Joffrey F ce8a02f713 Bumped RC 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-21 17:50:53 -08: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 656e6cffb6 1.7.0 release candidate 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-18 14:44:47 -08: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
Joffrey F 2f2d50d0c7 Merge pull request #898 from docker/https_docs_link 
Update HTTPS docs link
 2016-01-18 11:27:39 -08:00
Joffrey F 426f66af1c Update HTTPS docs link 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-18 11:21:12 -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
Joffrey F 6078040318 Don't break if base_url == None and TLS is enabled 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-08 16:41:15 -08: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
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
Joffrey F 59f569a246 Bumped version 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2015-12-09 17:38:26 -08: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
Joffrey F bb1ab12f54 Merge pull request #865 from dlorenc/master 
Allow utils.tar to take an existing file object.
 2015-12-08 12:19:11 -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
Dustin Falgout 5f9f3a4145 resolve merge conflict 
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
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
dlorenc adb3635378 Allow utils.tar to take an existing file object. 
Signed-off-by: dlorenc <lorenc.d@gmail.com>
 2015-11-30 14:51:26 -08:00
Joffrey F d51d06d209 Merge pull request #862 from docker/1.6.0-release 
1.6.0 release
 2015-11-30 14:05:16 -08:00
Joffrey F c0ec5512ae Merge pull request #861 from docker/860-deprecate-resolve-repo-name 
Update repo name resolution method
 2015-11-30 12:01:54 -08:00
Joffrey F 43b0ea5358 Merge pull request #841 from delfick/proxy_pool_manager_assert_hostname 
Ensure assert_hostname is set on the pool connection
 2015-11-24 13:41:56 -08:00
Joffrey F ee864f2cd9 Bump version 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2015-11-23 18:47:58 -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 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
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