Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Use get instead of bracket notation | Joffrey F | 2015-03-20 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Merge branch 'fix-port-host-net' of https://github.com/ssanderson/docker-py ↵ | Joffrey F | 2015-03-20 | 1 | -2/+8 | |
|\ \ \ \ | |/ / / |/| | | | | | | | into ssanderson-fix-port-host-net | |||||
| * | | | MAINT: Don't re-index multiple times. | Scott Sanderson | 2015-03-16 | 1 | -2/+2 | |
| | | | | ||||||
| * | | | BUG: Don't barf on Client.port when no port settings provided. | Scott Sanderson | 2015-03-16 | 1 | -0/+6 | |
| | | | | ||||||
* | | | | Don't allow 'version' param in AutoVersionClient ctor | Joffrey F | 2015-03-05 | 1 | -0/+4 | |
| | | | | ||||||
* | | | | Streamline exceptions for auto version ; retrieve_server_version into ↵ | Joffrey F | 2015-03-05 | 1 | -7/+12 | |
| | | | | | | | | | | | | | | | | protected method | |||||
* | | | | detect server version when version="auto" | Tomas Tomecek | 2015-03-05 | 1 | -12/+38 | |
| | | | | | | | | | | | | | | | | | | | | | | | | heavily inspired by PR#281 Signed-off-by: Tomas Tomecek <ttomecek@redhat.com> | |||||
* | | | | Merge branch 'master' of github.com:docker/docker-py | Joffrey F | 2015-03-04 | 1 | -0/+6 | |
|\ \ \ \ | ||||||
| * \ \ \ | Merge pull request #502 from cpuguy83/498_dockerignore_special_names | Joffrey F | 2015-02-27 | 1 | -0/+6 | |
| |\ \ \ \ | | | | | | | | | | | | | Add special cases for .dockerignore | |||||
| | * | | | | Add special cases for .dockerignore | Brian Goff | 2015-02-24 | 1 | -0/+6 | |
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #498 Allowing `Dockerfile` and `.dockerignore` in the exclusion filter completely breaks the build on docker < 1.5 In Docker 1.5 these entries are treated as special cases when included in the .dockerignore and are still sent as part of the context. The daemon ends up excluding them from any `ADD`, `COPY`, and cache validation. Signed-off-by: Brian Goff <cpuguy83@gmail.com> | |||||
* | | | | | Only call decode if Python 3.x | Joffrey F | 2015-03-04 | 1 | -1/+3 | |
| | | | | | ||||||
* | | | | | Merge branch 'py3-json' of https://github.com/ssanderson/docker-py into ↵ | Joffrey F | 2015-03-04 | 1 | -1/+1 | |
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | ssanderson-py3-json | |||||
| * | | | | BUG: Fix errors in Python 3 from JSON-decoding bytes. | Scott Sanderson | 2015-02-24 | 1 | -1/+1 | |
| |/ / / | ||||||
* | | | | Update resolve_authconfig to bring it in line with Docker client | Aanand Prasad | 2015-02-27 | 1 | -2/+1 | |
|/ / / | | | | | | | | | | | | | | | | | | | Instead of expanding the registry name we're looking for to a full URL, strip entries in the authconfig down to just the hostname. Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com> | |||||
* | | | Resolves #497 - add support for dockerfile | Daniel Nephin | 2015-02-20 | 1 | -2/+8 | |
|/ / | | | | | | | Signed-off-by: Daniel Nephin <dnephin@gmail.com> | |||||
* | | Added api_version property | Joffrey F | 2015-02-12 | 1 | -0/+4 | |
| | | ||||||
* | | Remove unused code | Joffrey F | 2015-02-12 | 1 | -7/+0 | |
| | | ||||||
* | | Add decode parameter to be able to the the stats as a dictionary | Christophe Labouisse | 2015-02-12 | 1 | -2/+2 | |
| | | ||||||
* | | Merge branch 'add-stats-api-support' of https://github.com/nir0s/docker-py ↵ | Joffrey F | 2015-02-12 | 1 | -0/+11 | |
|\ \ | | | | | | | | | | into nir0s-add-stats-api-support | |||||
| * | | added version compliable check | nir0s | 2015-02-12 | 1 | -0/+4 | |
| | | | ||||||
| * | | removed aggregation for now and added a unit test. also using stream_helper now | nir0s | 2015-02-12 | 1 | -19/+2 | |
| | | | ||||||
| * | | added initial support for stats retrieval | nir0s | 2015-02-11 | 1 | -0/+24 | |
| | | | ||||||
* | | | * Moved _container_config to utils.create_container_configmemoryswap | Joffrey F | 2015-02-11 | 1 | -133/+5 | |
| | | | | | | | | | | | | * memswap_limit can now be provided as a string, similar to mem_limit | |||||
* | | | Added support for pid_mode param | Joffrey F | 2015-02-11 | 1 | -9/+13 | |
| | | | ||||||
* | | | Merge pull request #480 from ggtools/events | Joffrey F | 2015-02-11 | 1 | -3/+24 | |
|\ \ \ | | | | | | | | | Add missing options to the events command | |||||
| * | | | Add a `decode` parameter to the events command | Christophe Labouisse | 2015-02-11 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will ensure compatibility with the previous versions of docker-py. Signed-off-by: Christophe Labouisse <christophe@labouisse.org> | |||||
| * | | | Add decoding to the events | Christophe Labouisse | 2015-02-11 | 1 | -2/+5 | |
| | | | | | | | | | | | | | | | | Signed-off-by: Christophe Labouisse <christophe@labouisse.org> | |||||
| * | | | Fix flake8 issues | Christophe Labouisse | 2015-02-11 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | Signed-off-by: Christophe Labouisse <christophe@labouisse.org> | |||||
| * | | | Add missing options to the events command | Christophe Labouisse | 2015-02-11 | 1 | -2/+20 | |
| |/ / | | | | | | | | | | | | | | | | | | | - Add since, until and filters parameters to `Client.events` - Add missing `events`command in the documentation Signed-off-by: Christophe Labouisse <christophe@labouisse.org> | |||||
* | | | read_only parameterread_only_rootfs | Joffrey F | 2015-02-10 | 1 | -2/+8 | |
|/ / | ||||||
* | | Merge pull request #482 from docker/rename_container | Joffrey F | 2015-02-10 | 1 | -12/+28 | |
|\ \ | | | | | | | New Client.rename() method | |||||
| * | | Bumped default API version, fixed rename() | Joffrey F | 2015-02-10 | 1 | -4/+12 | |
| | | | ||||||
| * | | Added rename method | Joffrey F | 2015-02-10 | 1 | -9/+17 | |
| | | | ||||||
* | | | Merge pull request #474 from gierschv/fix-build-remote | Joffrey F | 2015-02-10 | 1 | -0/+2 | |
|\ \ \ | |/ / |/| | | Fix crash when building from remote sources | |||||
| * | | Fix crash when building from remote sources | Vincent Giersch | 2015-02-04 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | | | | | | Avoid crashing when the Docker python client is able to load registry credentials when building using a remote source Signed-off-by: Vincent Giersch <vincent.giersch@ovh.net> | |||||
* | | | Rename Client._timeout to timeout. | Greg Taylor | 2015-02-04 | 1 | -3/+3 | |
|/ / | ||||||
* | | Fix #458 | Joffrey F | 2015-02-01 | 1 | -1/+1 | |
| | | ||||||
* | | Fix #466 | Joffrey F | 2015-02-01 | 1 | -4/+6 | |
| | | ||||||
* | | Merge pull request #441 from dims/fix-log-streams | Joffrey F | 2015-02-01 | 1 | -28/+14 | |
|\ \ | | | | | | | Fix to enable streaming container logs reliably | |||||
| * | | Fix to enable streaming container logs reliably | Davanum Srinivas | 2015-01-19 | 1 | -28/+14 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Started a ubuntu container that just runs "ping 8.8.8.8" and tried the sample code in https://gist.github.com/dims/c3327f633c526847c8e5 to recreate the problem mentioned in: https://github.com/docker/docker-py/issues/300 To debug the problem i printed the byte array read in recvall when reading STREAM_HEADER_SIZE_BYTES and realized that the data being read was far ahead of the actual start of the header documented in the vnd.docker.raw-stream of the docker remote api. This is possibly because the requests/urllib3 is reading ahead a bit more and we shouldn't be trying to hack the internals of those projects. So just using the documented file-like response.raw is good enough for us to get the functionality we need which is being able to read for exactly where the stream header starts. With this change i can reliably stream the logs just like "docker logs --follow". Note that we still need to access the underlying socket to set the timeout to prevent read time outs. The original fix was for client.logs() only but on further review it made sense to replace all occurances of _multiplexed_socket_stream_helper with the new method. | |||||
* | | | Add Support for Mac Address | James Harris | 2015-01-21 | 1 | -4/+6 | |
|/ / | | | | | | | | | | | The new docker api allows specifing mac address for containers. This change is to allow docker py the same functionality. Signed-off-by: James Harris <james@rancher.com> | |||||
* | | Revert noop change | Joffrey F | 2015-01-08 | 1 | -10/+9 | |
| | | ||||||
* | | Merge branch 'master' of https://github.com/rmohr/docker-py into rmohr-master | Joffrey F | 2015-01-08 | 1 | -12/+19 | |
|\ \ | ||||||
| * | | Keep unix socket alive with python3 | Roman Mohr | 2014-12-21 | 1 | -12/+19 | |
| |/ | ||||||
* | | Fix for issue #443 | Joffrey F | 2015-01-08 | 1 | -10/+14 | |
|/ | ||||||
* | Use create_host_config in start (unifying parameter processing)0.7.0-release | Joffrey F | 2014-12-18 | 1 | -72/+11 | |
| | ||||||
* | Fix create_container environment parameter for python3 | Joffrey F | 2014-12-18 | 1 | -2/+2 | |
| | ||||||
* | Merge pull request #427 from abanna/adding_multiple_dockercfg_support | Joffrey F | 2014-12-18 | 1 | -2/+6 | |
|\ | | | | | adding the ability to login with different dockercfg files. | |||||
| * | adding the ability to login with different dockercfg files. | Alex Banna | 2014-12-18 | 1 | -2/+6 | |
| | | ||||||
* | | flake8 fails with F821 for unicode under python 3.4.2 | Davanum Srinivas | 2014-12-18 | 1 | -1/+2 | |
|/ |