summaryrefslogtreecommitdiff
path: root/docker/client.py
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Make sure the build command in the client sends the auth credentials along. ↵Joseph Schorr2014-04-041-3/+14
| | | | | | | | | | | | Required for "FROM " lines that pull from private registries
* | | Fixed multiplexed_socket_stream_helpershin-2014-04-041-19/+17
| | |
* | | Merge branch 'PY3_fixes' of github.com:macobo/docker-py into macobo-PY3_fixesshin-2014-04-041-3/+11
|\ \ \ | |/ / |/| |
| * | Styling as per comment, decode to utf-8, join rather concat stringsKarl-Aksel Puulmann2014-03-111-5/+7
| | |
| * | Python 3 fixesKarl-Aksel Puulmann2014-03-111-2/+8
| | |
* | | don't yield blank linesMatt Way2014-03-301-1/+2
| |/ |/|
* | Use requests to read chunk data instead of parsing the raw streamDarren Shepherd2014-03-191-11/+2
| | | | | | | | | | | | The previous code had a bug in which it assumed that the chunk data had no newlines in it. In 0.9.0 newlines were added to the stream results, which exposed this bug.
* | Ensure that stream=True is passed to requests when version >= 1.8Darren Shepherd2014-03-191-1/+4
| |
* | remove reference to uninitialized variable and extra parameter in function callDaniel Graña2014-03-181-2/+2
| |
* | Support 'Domainname' in container creationJens Deppe2014-03-101-3/+4
|/
* Fix events() streaming by using _stream_helper()Maxime Petazzoni2014-02-211-14/+1
| | | | Signed-off-by: Maxime Petazzoni <max@signalfuse.com>
* Fix build() streaming and stream methods cleanupMaxime Petazzoni2014-02-211-19/+22
| | | | Signed-off-by: Maxime Petazzoni <max@signalfuse.com>
* Fix APIError for requests 1.1Chris St. Pierre2014-02-101-1/+4
| | | | | | | | requests 1.1, which is what's available on CentOS 6, doesn't support passing the response code as a keyword argument. It can be set after the fact on both requests 1.1 and 1.2. Docker-DCO-1.1-Signed-off-by: Chris St. Pierre <chris.a.st.pierre@gmail.com> (github: stpierre)
* Support remote API v1.8 (and make it the default)Maxime Petazzoni2014-02-051-2/+5
| | | | Signed-off-by: Maxime Petazzoni <max@signalfuse.com>
* Fixed malformatted request when using empty list in create_container()Anthony Baire2014-02-041-2/+2
| | | | | | | | create_container() sends a malformatted request when volumes==[] or ports==[], causing error 500 "create: ExportEnv json: cannot unmarshal array into Go value of type map" The empty lists must be converted into a dict (or removed)
* Merge pull request #156 from dmiyakawa/masterJoffrey F2014-01-311-0/+2
|\ | | | | Allow copy() to accept dictionary like diff()
| * Allow copy() to accept dictionary like diff()Daisuke Miyakawa2014-01-311-0/+2
| | | | | | | | | | | | | | Client.diff() silently convert container as a dictionary to container['Id'] while Client.copy() does not. This change makes copy() do the same job.
* | Fix _stream_result concatenating bytes with strBen Firshman2014-01-281-1/+1
|/ | | | | Without this option, requests returns lines as bytes on Python 3 which can't be concatenated with the str '\n' in the yield.
* Merge pull request #151 from ibuildthecloud/http-unix-schemeJoffrey F2014-01-271-3/+5
|\ | | | | Support requests >=2.1.0
| * Support requests >=2.1.0Darren Shepherd2014-01-261-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Starting with requests 2.1.0 non-HTTP scheme URLs are not parsed anymore. The net effect of this is that when using the unix socket in docker-py no query string params are passed in the URL. This change makes docker-py internally use the scheme http+unix to indicate to requests that this is still a HTTP URL and should be parsed. Users of docker-py can still specify 'unix:' as the base_url. The following forms of base_url are accepted. http+unix://var/run/docker.sock unix://var/run/docker.sock unix:///var/run/docker.sock http://hostname tcp://hostname
* | Merge pull request #145 from aanand/set-stdinonceJoffrey F2014-01-271-0/+3
|\ \ | | | | | | If attaching to stdin, set StdinOnce, as per the docker CLI.
| * | If attaching to stdin, set StdinOnce, as per the docker CLI.Aanand Prasad2014-01-201-0/+3
| |/
* | Allow links to specified as (name, alias) tuplesBen Firshman2014-01-271-1/+4
|/
* Add working_dir option to create_containerBen Firshman2014-01-191-4/+5
|
* Add cpu_shares option to create_containerBen Firshman2014-01-191-4/+7
|
* Add entrypoint option to create_containerBen Firshman2014-01-191-4/+6
|
* Merge branch 'master' of git://github.com/dotcloud/docker-pyshin-2014-01-161-87/+108
|\
| * Merge pull request #119 from ureyes84/masterJoffrey F2014-01-161-6/+6
| |\ | | | | | | Updated port function
| | * Shortened linesUlises Reyes2013-12-141-5/+5
| | |
| | * Updated the port function in order to parse the new NetworkSettings Port ↵Ulises Reyes2013-12-141-6/+6
| | | | | | | | | | | | dict (fixes #88)
| * | Default to /tcp for port definitions in create_container()Maxime Petazzoni2014-01-161-5/+2
| | | | | | | | | | | | | | | | | | Fixes #141. Signed-off-by: Maxime Petazzoni <max@signalfuse.com>
| * | Merge pull request #138 from aanand/container-output-without-logsMaxime Petazzoni2014-01-161-26/+26
| |\ \ | | | | | | | | container_output() method for streaming the output without logs=1
| | * | attach() method now parses multiplexing framesAanand Prasad2014-01-161-26/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous version of `attach` didn't look like it was doing anything useful, as it just yielded 4096-byte chunks of raw /attach output, without doing any frame parsing. Now `attach` is identical to `logs`, except that by default it doesn't show historical output. `logs` is now a wrapper around `attach` which sets `logs=True`, and its behaviour is unchanged.
| * | | Use relative importsAanand Prasad2014-01-161-3/+3
| | | |
| * | | Merge pull request #140 from aanand/sensible-url-handlingMaxime Petazzoni2014-01-141-1/+5
| |\ \ \ | | | | | | | | | | Sensible url handling
| | * | | Accept base_url of NoneAanand Prasad2014-01-141-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it very simple to get identical behaviour to the CLI: client = Client(os.environ.get('DOCKER_HOST'))
| | * | | Handle tcp:// URLsAanand Prasad2014-01-141-0/+2
| | |/ / | | | | | | | | | | | | | | | | | | | | This means docker-py will do the Right Thing if the base url is set using the new `DOCKER_HOST` environment variable, for example. (http://docs.docker.io/en/latest/commandline/cli/)
| * | | Break down _post() parameters one-per-line in build()Aanand Prasad2014-01-141-1/+6
| | | |
| * | | Configurable timeout on build(), defaults to NoneAanand Prasad2014-01-141-2/+2
| |/ / | | | | | | | | | | | | | | | | | | Many commands used in Dockerfiles hang for an extended period of time without producing any output, which will result in a socket timeout. Accordingly, it makes sense for build() to specify no timeout by default.
| * | Rework auth config loading and use of auth data for login/pull/pushMaxime Petazzoni2014-01-071-40/+50
| | | | | | | | | | | | Signed-off-by: Maxime Petazzoni <max@signalfuse.com>
| * | Option to disable network when creating container.Nada Amin2014-01-031-3/+6
| | |
| * | A socket that is wrapped in a file-like object must be set to blocking.Jake Moshenko2013-12-311-1/+3
| | |
* | | Removed data argument in import_image (unused?)shin-2014-01-161-2/+1
| | |
* | | Merge branch 'feature/image-import' of github.com:tarnfeld/docker-py into ↵shin-2014-01-161-16/+24
|\ \ \ | |/ / |/| | | | | tarnfeld-feature/image-import
| * | Implement importing images from an image name instead of srcTom Arnfeld2013-12-061-16/+24
| | |
* | | Style fixes for flake8Maxime Petazzoni2013-12-241-3/+2
| | | | | | | | | | | | Signed-off-by: Maxime Petazzoni <max@signalfuse.com>
* | | Fix infinite loop in Client.logs(stream=True) caused by connection close.Fedor Korotkiy2013-12-241-1/+8
| | |
* | | Merge pull request #122 from mpetazzoni/base-url-sanitizeJoffrey F2013-12-171-0/+2
|\ \ \ | | | | | | | | Remove trailing slashes in base_url
| * | | Remove trailing slashes in base_url. Fixes #108Maxime Petazzoni2013-12-161-0/+2
| | |/ | |/| | | | | | | Signed-off-by: Maxime Petazzoni <max@signalfuse.com>
* | | Fix stream receive by correctly reading all required bytes from the socketMaxime Petazzoni2013-12-161-2/+11
|/ / | | | | | | Signed-off-by: Maxime Petazzoni <max@signalfuse.com>