summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Different requirements.txt in Dockerfile-py3hostname_ip_matchingJoffrey F2016-03-292-6/+6
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* flake8 fixesJoffrey F2016-03-291-2/+4
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Tests for match_hostname backportJoffrey F2016-03-292-17/+73
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Add match_hostname implementation and monkey-patch for py<3.5Joffrey F2016-03-292-0/+139
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Add py2-ipaddress dependency for python 2.xJoffrey F2016-03-294-1/+9
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #1011 from tomleb/masterJoffrey F2016-03-241-1/+1
|\ | | | | Specify default value of stop's timeout
| * Specify default value of stop's timeouttomleb2016-03-231-1/+1
|/ | | | Signed-off-by: Tom Lebreux <tomlebreux@hotmail.com>
* Update release script. Bump to rc21.8.0-rc2Joffrey F2016-03-232-3/+2
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #1010 from docker/1.8.0rc11.8.0-rc1Joffrey F2016-03-233-1/+44
|\ | | | | 1.8.0rc1
| * Update ChangeLog1.8.0rc1Joffrey F2016-03-231-0/+42
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * Add README.rst to MANIFESTJoffrey F2016-03-231-0/+1
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * Set version to RC1Joffrey F2016-03-231-1/+1
|/ | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge branch 'dimaspivak-master'Joffrey F2016-03-234-3/+20
|\
| * Test commit changes paramJoffrey F2016-03-231-0/+14
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * Merge branch 'master' of https://github.com/dimaspivak/docker-py into ↵Joffrey F2016-03-233-3/+6
| |\ |/ / | | | | dimaspivak-master
| * Add support for changes param to ContainerApiMixin.commitDima Spivak2016-03-213-3/+6
| | | | | | | | | | | | docker commit --changes was added to Docker in 1.6.0. Signed-off-by: Dima Spivak <dima@spivak.ch>
* | Merge branch 'gferon-master'Joffrey F2016-03-232-1/+10
|\ \
| * | check_duplicate testJoffrey F2016-03-231-0/+7
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | Merge branch 'master' of https://github.com/gferon/docker-py into gferon-masterJoffrey F2016-03-231-1/+3
| |\ \
| | * | Add missing CheckDuplicate parameter to /networks/create API callGabriel Féron2016-03-221-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | Merge pull request #972 from vitalyisaev2/masterJoffrey F2016-03-231-4/+4
|\ \ \ \ | | | | | | | | | | UnixHTTPConnectionPool initialization error
| * | | | Fix UnixHTTPConnectionPool's superclass initializationVitaly Isaev2016-03-031-4/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Vitaly Isaev <vitalyisaev2@gmail.com>
* | | | | Merge pull request #1007 from docker/959-release-scriptJoffrey F2016-03-233-0/+38
|\ \ \ \ \ | | | | | | | | | | | | Basic release script
| * | | | | Basic release script959-release-scriptJoffrey F2016-03-223-0/+38
| | |/ / / | |/| | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | | Merge pull request #1008 from docker/speedplane-patch-1Joffrey F2016-03-233-4/+39
|\ \ \ \ \ | |/ / / / |/| | | | Use gzip to compress tar balls before sending
| * | | | 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>