Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Different requirements.txt in Dockerfile-py3hostname_ip_matching | Joffrey F | 2016-03-29 | 2 | -6/+6 |
| | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
* | flake8 fixes | Joffrey F | 2016-03-29 | 1 | -2/+4 |
| | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
* | Tests for match_hostname backport | Joffrey F | 2016-03-29 | 2 | -17/+73 |
| | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
* | Add match_hostname implementation and monkey-patch for py<3.5 | Joffrey F | 2016-03-29 | 2 | -0/+139 |
| | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
* | Add py2-ipaddress dependency for python 2.x | Joffrey F | 2016-03-29 | 4 | -1/+9 |
| | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
* | Merge pull request #1011 from tomleb/master | Joffrey F | 2016-03-24 | 1 | -1/+1 |
|\ | | | | | Specify default value of stop's timeout | ||||
| * | Specify default value of stop's timeout | tomleb | 2016-03-23 | 1 | -1/+1 |
|/ | | | | Signed-off-by: Tom Lebreux <tomlebreux@hotmail.com> | ||||
* | Update release script. Bump to rc21.8.0-rc2 | Joffrey F | 2016-03-23 | 2 | -3/+2 |
| | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
* | Merge pull request #1010 from docker/1.8.0rc11.8.0-rc1 | Joffrey F | 2016-03-23 | 3 | -1/+44 |
|\ | | | | | 1.8.0rc1 | ||||
| * | Update ChangeLog1.8.0rc1 | Joffrey F | 2016-03-23 | 1 | -0/+42 |
| | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | Add README.rst to MANIFEST | Joffrey F | 2016-03-23 | 1 | -0/+1 |
| | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | Set version to RC1 | Joffrey F | 2016-03-23 | 1 | -1/+1 |
|/ | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
* | Merge branch 'dimaspivak-master' | Joffrey F | 2016-03-23 | 4 | -3/+20 |
|\ | |||||
| * | Test commit changes param | Joffrey F | 2016-03-23 | 1 | -0/+14 |
| | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | Merge branch 'master' of https://github.com/dimaspivak/docker-py into ↵ | Joffrey F | 2016-03-23 | 3 | -3/+6 |
| |\ |/ / | | | | | dimaspivak-master | ||||
| * | Add support for changes param to ContainerApiMixin.commit | Dima Spivak | 2016-03-21 | 3 | -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 F | 2016-03-23 | 2 | -1/+10 |
|\ \ | |||||
| * | | check_duplicate test | Joffrey F | 2016-03-23 | 1 | -0/+7 |
| | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | | Merge branch 'master' of https://github.com/gferon/docker-py into gferon-master | Joffrey F | 2016-03-23 | 1 | -1/+3 |
| |\ \ | |||||
| | * | | Add missing CheckDuplicate parameter to /networks/create API call | Gabriel Féron | 2016-03-22 | 1 | -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/master | Joffrey F | 2016-03-23 | 1 | -4/+4 |
|\ \ \ \ | | | | | | | | | | | UnixHTTPConnectionPool initialization error | ||||
| * | | | | Fix UnixHTTPConnectionPool's superclass initialization | Vitaly Isaev | 2016-03-03 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Vitaly Isaev <vitalyisaev2@gmail.com> | ||||
* | | | | | Merge pull request #1007 from docker/959-release-script | Joffrey F | 2016-03-23 | 3 | -0/+38 |
|\ \ \ \ \ | | | | | | | | | | | | | Basic release script | ||||
| * | | | | | Basic release script959-release-script | Joffrey F | 2016-03-22 | 3 | -0/+38 |
| | |/ / / | |/| | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
* | | | | | Merge pull request #1008 from docker/speedplane-patch-1 | Joffrey F | 2016-03-23 | 3 | -4/+39 |
|\ \ \ \ \ | |/ / / / |/| | | | | Use gzip to compress tar balls before sending | ||||
| * | | | | gzip build testspeedplane-patch-1 | Joffrey F | 2016-03-23 | 1 | -0/+28 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | | | | Make gzip encoding optional | Joffrey F | 2016-03-22 | 1 | -4/+9 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | | | | Fix line-spacing for build | Michael Sander | 2016-03-22 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | Signed-off-by: Michael Sander <michael.sander@docketalarm.com> | ||||
| * | | | | Encode the tar ball with gzip | Michael Sander | 2016-03-22 | 1 | -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 Sander | 2016-03-22 | 1 | -2/+2 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | This can be used to make building much faster. Signed-off-by: speedplane <mes65@cornell.edu> | ||||
* | | | | Merge branch 'bfirsh-from_env' | Joffrey F | 2016-03-22 | 7 | -42/+64 |
|\ \ \ \ | |||||
| * | | | | Update mkdocs.yml to reference new Machine page. | Joffrey F | 2016-03-22 | 3 | -4/+11 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | | | | Merge branch 'from_env' of https://github.com/bfirsh/docker-py into ↵ | Joffrey F | 2016-03-22 | 5 | -40/+55 |
| |\ \ \ \ |/ / / / / | | | | | | | | | | | bfirsh-from_env | ||||
| * | | | | Add docker.from_env() shortcut | Ben Firshman | 2016-03-15 | 5 | -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/master | Joffrey F | 2016-03-22 | 3 | -1/+22 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Support OomScoreAdj in host configuration | ||||
| * | | | | Support OomScoreAdj in host configuration | Aditya Marella | 2016-03-22 | 3 | -1/+22 |
|/ / / / | | | | | | | | | | | | | Signed-off-by: Aditya Marella <aditya.marella@gmail.com> | ||||
* | | | | Merge pull request #1006 from docker/kwargs_from_env_alt | Aanand Prasad | 2016-03-22 | 2 | -4/+20 |
|\ \ \ \ | |_|_|/ |/| | | | Support passing an alternate environment dict to kwargs_from_env | ||||
| * | | | Support passing an alternate environment dict to kwargs_from_envkwargs_from_env_alt | Joffrey F | 2016-03-21 | 2 | -4/+20 |
|/ / / | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
* | | | Merge pull request #997 from wenchma/21080-net_link | Daniel Nephin | 2016-03-21 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Remove the network mode to support linkable cantainers check | ||||
| * | | | Remove the network mode to support linkable cantainers check | wenchma | 2016-03-21 | 1 | -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-parsehost | Aanand Prasad | 2016-03-18 | 2 | -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-parsehost | Joffrey F | 2016-03-17 | 2 | -3/+9 |
|/ / / | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
* | | | Merge pull request #995 from docker/default-version-1.22 | Joffrey F | 2016-03-16 | 3 | -27/+35 |
|\ \ \ | | | | | | | | | Update default API version to 1.22 | ||||
| * | | | Update default API version to 1.22default-version-1.22 | Joffrey F | 2016-03-16 | 3 | -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-support | Daniel Nephin | 2016-03-16 | 6 | -1/+145 |
|\ \ \ | |/ / |/| | | tmpfs support | ||||
| * | | Add tmpfs doc to mkdocs.yml | Aanand Prasad | 2016-03-16 | 1 | -0/+1 |
| | | | | | | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com> | ||||
| * | | Don't support tmpfs in API version < 1.22 | Aanand Prasad | 2016-03-16 | 2 | -0/+4 |
| | | | | | | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com> | ||||
| * | | Add tmpfs integration test | Aanand Prasad | 2016-03-16 | 1 | -0/+16 |
| | | | | | | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com> | ||||
| * | | Reword tmpfs documentation | Aanand Prasad | 2016-03-16 | 1 | -12/+13 |
| | | | | | | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com> | ||||
| * | | Clarify error messages when bad values are passed in for tmpfs | Aanand Prasad | 2016-03-16 | 1 | -2/+4 |
| | | | | | | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com> |