summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* gzip build testspeedplane-patch-1Joffrey F2016-03-231-0/+28
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Make gzip encoding optionalJoffrey F2016-03-221-4/+9
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Fix line-spacing for buildMichael Sander2016-03-221-1/+2
| | | Signed-off-by: Michael Sander <michael.sander@docketalarm.com>
* Encode the tar ball with gzipMichael Sander2016-03-221-1/+2
| | | | | | Gzipping this tarball can greatly reduce the time it takes to send a docker file. Signed-off-by: speedplane <mes65@cornell.edu>
* Add an option to gzip tar files.Michael Sander2016-03-221-2/+2
| | | | | | This can be used to make building much faster. Signed-off-by: speedplane <mes65@cornell.edu>
* Merge branch 'bfirsh-from_env'Joffrey F2016-03-227-42/+64
|\
| * Update mkdocs.yml to reference new Machine page.Joffrey F2016-03-223-4/+11
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * Merge branch 'from_env' of https://github.com/bfirsh/docker-py into ↵Joffrey F2016-03-225-40/+55
| |\ |/ / | | | | bfirsh-from_env
| * Add docker.from_env() shortcutBen Firshman2016-03-155-40/+55
| | | | | | | | | | | | A much neater way of getting started with docker-py. Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* | Merge pull request #1002 from adityamarella/masterJoffrey F2016-03-223-1/+22
|\ \ | | | | | | Support OomScoreAdj in host configuration
| * | Support OomScoreAdj in host configurationAditya Marella2016-03-223-1/+22
|/ / | | | | | | Signed-off-by: Aditya Marella <aditya.marella@gmail.com>
* | Merge pull request #1006 from docker/kwargs_from_env_altAanand Prasad2016-03-222-4/+20
|\ \ | | | | | | Support passing an alternate environment dict to kwargs_from_env
| * | Support passing an alternate environment dict to kwargs_from_envkwargs_from_env_altJoffrey F2016-03-212-4/+20
|/ / | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #997 from wenchma/21080-net_linkDaniel Nephin2016-03-211-1/+1
|\ \ | | | | | | Remove the network mode to support linkable cantainers check
| * | Remove the network mode to support linkable cantainers checkwenchma2016-03-211-1/+1
|/ / | | | | | | | | | | Partially related to issue #21080 Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
* | Merge pull request #999 from docker/tcp-to-https-parsehostAanand Prasad2016-03-182-3/+9
|\ \ | | | | | | If TCP host is provided while TLS is enabled, convert to https
| * | If tcp host is provided while TLS is enabled, convert to httpstcp-to-https-parsehostJoffrey F2016-03-172-3/+9
|/ / | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #995 from docker/default-version-1.22Joffrey F2016-03-163-27/+35
|\ \ | | | | | | Update default API version to 1.22
| * | Update default API version to 1.22default-version-1.22Joffrey F2016-03-163-27/+35
| |/ | | | | | | | | | | | | | | Update engine version used for integration tests IP address configuration tests needed tweaking Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #994 from aanand/janLo-tmpfs-supportDaniel Nephin2016-03-166-1/+145
|\ \ | |/ |/| tmpfs support
| * Add tmpfs doc to mkdocs.ymlAanand Prasad2016-03-161-0/+1
| | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
| * Don't support tmpfs in API version < 1.22Aanand Prasad2016-03-162-0/+4
| | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
| * Add tmpfs integration testAanand Prasad2016-03-161-0/+16
| | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
| * Reword tmpfs documentationAanand Prasad2016-03-161-12/+13
| | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
| * Clarify error messages when bad values are passed in for tmpfsAanand Prasad2016-03-161-2/+4
| | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
| * Add documentation for the Tmpfs Hostconfig option.Jan Losinski2016-03-162-0/+34
| | | | | | | | Signed-off-by: Jan Losinski <losinski@wh2.tu-dresden.de>
| * Add unittest for the Tmpfs Hostconfig optionJan Losinski2016-03-161-0/+56
| | | | | | | | Signed-off-by: Jan Losinski <losinski@wh2.tu-dresden.de>
| * Add support for Tmpfs declaration in Hostconfig.Jan Losinski2016-03-161-1/+31
|/ | | | | | | 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>
* Merge pull request #988 from docker/tls-fixesJoffrey F2016-03-152-17/+5
|\ | | | | Fix enable_tls issue
| * Merge branch 'master' into tls-fixestls-fixesJoffrey F2016-03-151-6/+5
| |\ | |/ |/|
* | Merge pull request #990 from docker/docker-21153Joffrey F2016-03-141-6/+5
|\ \ | | | | | | Invalid log driver error raised during create_container step
| * | Invalid log driver error raised during create_container stepdocker-21153Joffrey F2016-03-141-6/+5
|/ / | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * Fix enable_tls issue #984Joffrey F2016-03-112-17/+5
|/ | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge branch 'mdaue-935'Joffrey F2016-03-092-0/+66
|\
| * Merge branch '935' of https://github.com/mdaue/docker-py into mdaue-935Joffrey F2016-03-092-0/+66
| |\ |/ /
| * Add ip4&ip6 (#935) support, network/id/connectMatt Daue2016-03-022-0/+66
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge pull request #977 from TomasTomecek/put-test-data-to-distJoffrey F2016-03-081-0/+1
|\ \ | | | | | | include unit test data in dist tarball
| * | include unit test data in dist tarballTomas Tomecek2016-03-081-0/+1
|/ / | | | | | | | | | | Fixes #976 Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
* | Merge pull request #971 from docker/963-tlsv1-defaultJoffrey F2016-03-031-1/+6
|\ \ | |/ |/| Use protocol TLS v1.0 by default when none is set.
| * Use protocol TLS v1.0 by default when none is set.963-tlsv1-defaultJoffrey F2016-03-021-1/+6
|/ | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #970 from marshyski/masterAanand Prasad2016-03-021-1/+1
|\ | | | | Updated stat networks print output
| * Updated stat networks print output Signed-off-by: Tim Marcinowski ↵Tim Ski2016-03-021-1/+1
|/ | | | <marshyski@gmail.com>
* Merge pull request #968 from atopuzov/decode_on_push_and_pullJoffrey F2016-03-011-4/+4
|\ | | | | Use decode on push and pull operations.
| * Use decode on push and pull operations.Aleksandar Topuzovic2016-03-011-4/+4
|/ | | | | | | 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>
* Merge pull request #916 from docker/container_update_featureJoffrey F2016-02-246-40/+132
|\ | | | | Support for container limits update
| * Improve parse_bytes util methodcontainer_update_featureJoffrey F2016-02-232-40/+36
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * update_container now supports string valuesJoffrey F2016-02-231-4/+5
| | | | | | | | | | | | for mem_limit, memswap_limit, kernel_memory and mem_reservation Signed-off-by: Joffrey F <joffrey@docker.com>
| * Unit test for Client.update_container methodJoffrey F2016-02-232-0/+25
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * Documentation for Client.update_container methodJoffrey F2016-02-231-1/+21
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * New `update_container` methodJoffrey F2016-02-232-0/+50
| | | | | | | | | | | | Allows user to update container limits in-flight. Signed-off-by: Joffrey F <joffrey@docker.com>