summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Updated changelog, bumped version to 0.3.00.3.0shin-2014-02-242-1/+35
|
* Merge pull request #167 from mpetazzoni/build-outputJoffrey F2014-02-241-30/+20
|\ | | | | Fix build() and events() streaming
| * 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>
* Clarify port bindings documentation for non-TCP port bindingsMaxime Petazzoni2014-02-181-6/+8
| | | | Signed-off-by: Maxime Petazzoni <max@signalfuse.com>
* Updated integration testsshin-2014-02-181-27/+15
|
* Merge pull request #165 from stpierre/fix-http-errorJoffrey F2014-02-101-1/+4
|\ | | | | Fix APIError for requests 1.1
| * 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)
* Merge pull request #161 from mpetazzoni/api-1.8Joffrey F2014-02-063-7/+21
|\ | | | | Support remote API v1.8 (and make it the default)
| * Support remote API v1.8 (and make it the default)Maxime Petazzoni2014-02-053-7/+21
|/ | | | Signed-off-by: Maxime Petazzoni <max@signalfuse.com>
* Merge pull request #158 from a-ba/masterMaxime Petazzoni2014-02-051-2/+2
|\ | | | | Fixed malformatted request when using empty list in create_container()
| * 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.
* | Merge pull request #155 from bfirsh/fix-concat-string-with-bytesJoffrey F2014-01-311-1/+1
|\ \ | | | | | | Fix _stream_result concatenating bytes with str
| * | 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 #157 from ticosax/ping-fixesJoffrey F2014-01-311-1/+2
|\ \ | |/ |/| Ping fixes
| * A ping should be successful if status_code is less than 400Nicolas Delaby2014-01-311-1/+1
| |
| * replace status with status_code as defined by requests APINicolas Delaby2014-01-311-1/+2
|/ | | | | Move this statement in `else` clause to make sure the try except block doesn't catch coding errors.
* Merge pull request #154 from ibuildthecloud/fix-post-http-unix-merge-testsMaxime Petazzoni2014-01-271-2/+2
|\ | | | | Fix unit tests broken by PR #151
| * Fix unit tests broken by PR #151Darren Shepherd2014-01-271-2/+2
|/ | | | Updates newer unit tests to use the http+unix scheme.
* Merge pull request #151 from ibuildthecloud/http-unix-schemeJoffrey F2014-01-275-68/+98
|\ | | | | Support requests >=2.1.0
| * Update to requests==2.2.1Darren Shepherd2014-01-271-1/+1
| |
| * flake8 fixesDarren Shepherd2014-01-261-62/+63
| | | | | | | | Additionally this change should make moving to /v1.8 slightly less painful
| * Support requests >=2.1.0Darren Shepherd2014-01-264-64/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-272-0/+29
|\ \ | | | | | | 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-202-0/+29
| | |
* | | Merge pull request #153 from bfirsh/links-as-tuplesJoffrey F2014-01-273-1/+34
|\ \ \ | |_|/ |/| | Allow links to specified as (name, alias) tuples
| * | Allow links to specified as (name, alias) tuplesBen Firshman2014-01-273-1/+34
|/ /
* | Merge pull request #146 from felixhummel/fix-readme-bindsJoffrey F2014-01-251-2/+2
|\ \ | |/ |/| fix "binds" docs: { host_dir: docker_dir }
| * fix "binds" docs: { host_dir: docker_dir }Felix Hummel2014-01-251-2/+2
|/ | | | Not the other way around.
* Merge pull request #144 from bfirsh/add-missing-create-container-optionsJoffrey F2014-01-203-5/+78
|\ | | | | Add entrypoint, cpu_shares and working_dir options to create_container
| * Add working_dir option to create_containerBen Firshman2014-01-193-5/+28
| |
| * Add cpu_shares option to create_containerBen Firshman2014-01-193-5/+30
| |
| * Add entrypoint option to create_containerBen Firshman2014-01-193-5/+30
|/
* Merge branch 'master' of git://github.com/dotcloud/docker-pyshin-2014-01-167-162/+296
|\
| * Merge pull request #119 from ureyes84/masterJoffrey F2014-01-164-10/+75
| |\ | | | | | | Updated port function
| | * Improves code styleUlises Reyes2013-12-153-66/+34
| | |
| | * Refactored test. It now makes 2 calls to portUlises Reyes2013-12-151-17/+20
| | |
| | * Shortened linesUlises Reyes2013-12-142-6/+7
| | |
| | * Improved assertions in the port testUlises Reyes2013-12-141-2/+7
| | |
| | * Updated the port function in order to parse the new NetworkSettings Port ↵Ulises Reyes2013-12-144-11/+99
| | | | | | | | | | | | dict (fixes #88)
| * | Merge pull request #143 from mpetazzoni/tcp-default-protoJoffrey F2014-01-162-7/+4
| |\ \ | | | | | | | | Default to /tcp for port definitions in create_container()
| | * | Default to /tcp for port definitions in create_container()Maxime Petazzoni2014-01-162-7/+4
| |/ / | | | | | | | | | | | | | | | Fixes #141. Signed-off-by: Maxime Petazzoni <max@signalfuse.com>
| * | Merge pull request #138 from aanand/container-output-without-logsMaxime Petazzoni2014-01-162-26/+34
| |\ \ | | | | | | | | container_output() method for streaming the output without logs=1
| | * | attach() method now parses multiplexing framesAanand Prasad2014-01-162-26/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | Merge pull request #142 from aanand/use-relative-importsMaxime Petazzoni2014-01-162-4/+4
| |\ \ \ | | | | | | | | | | Use relative imports
| | * | | Use relative importsAanand Prasad2014-01-162-4/+4
| |/ / /
| * | | 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'))
View Lorry Controller Status