summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update HTTPS docs linkhttps_docs_linkJoffrey F2016-01-182-3/+3
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #895 from aanand/aliasAanand Prasad2016-01-148-10/+136
|\ | | | | Implement support for network-scoped aliases
| * Implement support for network-scoped aliasesAanand Prasad2016-01-148-10/+136
|/ | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* Merge pull request #892 from docker/base_url_noneDaniel Nephin2016-01-111-1/+1
|\ | | | | Don't break if base_url == None and TLS is enabled
| * Don't break if base_url == None and TLS is enabledbase_url_noneJoffrey F2016-01-081-1/+1
|/ | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #818 from rmb938/patch-1Aanand Prasad2016-01-057-4/+83
|\ | | | | allow custom ipam options when creating networks
| * allow custom ipam options when creating networksRyan Belgrave2016-01-047-4/+83
| | | | | | | | Signed-off-by: Ryan Belgrave <rmb1993@gmail.com>
* | Merge pull request #888 from wenchma/18626-sync_inspect_networkJoffrey F2016-01-041-9/+5
|\ \ | |/ |/| Update the test_inspect_network
| * Update docker network inspect testwenchma2015-12-301-9/+5
| | | | | | | | | | | | | | | | This is based on https://github.com/docker/docker/pull/18928 Related to docker/docker#18626 Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
* | Merge pull request #882 from docker/881-hostconfig_docJoffrey F2016-01-041-0/+2
|\ \ | |/ |/| Add cpu_quota and cpu_period to the HostConfig documentation
| * Add cpu_quota and cpu_period to the HostConfig documentation881-hostconfig_docJoffrey F2015-12-221-0/+2
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #884 from docker/stop_test_updateJoffrey F2015-12-231-6/+0
|\ \ | | | | | | Don't expect non-zero exit code when stopping a container
| * | Don't expect non-zero exit code when stopping a containerstop_test_updateJoffrey F2015-12-231-6/+0
|/ / | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #883 from joshpurvis/jp-since-docsDaniel Nephin2015-12-231-0/+1
|\ \ | |/ |/| Add docs for since argument in container logs method
| * Add docs for argument when retrieving container logsJosh Purvis2015-12-231-0/+1
|/ | | | Signed-off-by: Josh Purvis <jpurvis@kwantera.com>
* Merge pull request #863 from thomasboyt/fast-exclude-pathsAanand Prasad2015-12-163-27/+62
|\ | | | | Don't descend into ignored directories when building context
| * Improve get_paths performance by not descending into ignored directoriesThomas Boyt2015-12-083-27/+62
| | | | | | | | Signed-off-by: Thomas Boyt <thomas@ledgerx.com>
* | Merge pull request #874 from aanand/fix-index.docker.ioAanand Prasad2015-12-163-47/+91
|\ \ | | | | | | Treat 'index.docker.io' repo names as 'docker.io'
| * | Treat 'index.docker.io' repo names as 'docker.io'Aanand Prasad2015-12-102-8/+38
| | | | | | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
| * | Refactor resolve_authconfig testsAanand Prasad2015-12-102-38/+52
| | | | | | | | | | | | | | | | | | | | | The structure of the fake config dictionary was not reflective of what actual parsed config looks like. Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
| * | Allow overriding of positional args to py.test in tox.iniAanand Prasad2015-12-101-1/+1
|/ / | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | Bumped versionJoffrey F2015-12-091-1/+1
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #871 from thaJeztah/update-maintainersJoffrey F2015-12-091-5/+52
|\ \ | | | | | | update maintainers file for parsing
| * | update maintainers file for parsingSebastiaan van Stijn2015-12-091-5/+52
| | | | | | | | | | | | | | | | | | | | | | | | this updates the MAINTAINERS file to the new format, so that it can be parsed and collected in the docker/opensource repository. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* | | Merge pull request #867 from sumitsahrawat/network-create-optionsAanand Prasad2015-12-096-10/+76
|\ \ \ | |/ / |/| | Allow providing options when creating networks
| * | Fix #869: Add docs for network apiSumit Sahrawat2015-12-101-0/+62
| | | | | | | | | | | | Signed-off-by: Sumit Sahrawat <sumit.sahrawat.apm13@iitbhu.ac.in>
| * | Fix remove_volume return valueSumit Sahrawat2015-12-104-7/+3
| | | | | | | | | | | | Signed-off-by: Sumit Sahrawat <sumit.sahrawat.apm13@iitbhu.ac.in>
| * | Allow providing options when creating networksSumit Sahrawat2015-12-102-3/+11
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | Following the spec: http://docs.docker.com/engine/reference/api/docker_remote_api_v1.21/#create-a-network I have added an Options argument to create_network. This opens up the possibility of creating isolated containers with no internet access programmatically. We require such facilities in https://github.com/jupyter/tmpnb/issues/187. Signed-off-by: Sumit Sahrawat <sumit.sahrawat.apm13@iitbhu.ac.in>
* | Merge pull request #868 from jstewmon/config-stop-signalJoffrey F2015-12-084-3/+30
|\ \ | | | | | | added stop_signal to create container config
| * | added stop_signal to create container configJonathan Stewmon2015-12-034-3/+30
| | | | | | | | | | | | Signed-off-by: Jonathan Stewmon <jstewmon@rmn.com>
* | | Merge pull request #865 from dlorenc/masterJoffrey F2015-12-081-5/+6
|\ \ \ | |_|/ |/| | Allow utils.tar to take an existing file object.
| * | Allow utils.tar to take an existing file object.dlorenc2015-11-301-5/+6
| | | | | | | | | | | | Signed-off-by: dlorenc <lorenc.d@gmail.com>
* | | Merge pull request #854 from ↵Aanand Prasad2015-12-043-61/+67
|\ \ \ | | | | | | | | | | | | | | | | lots0logs/840-add-exception-utility-method-for-create-host-config 840 add exception utility method for create host config
| * | | incorporate feedbackDustin Falgout2015-12-043-46/+45
| | | | | | | | | | | | | | | | Signed-off-by: Dustin Falgout <dustin@falgout.us>
| * | | Use new methods to raise exceptions in create_host_config.Dustin Falgout2015-12-032-36/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Added tests for the new methods. Closes #840 Signed-off-by: Dustin Falgout <dustin@falgout.us>
| * | | resolve merge conflictDustin Falgout2015-12-031-10/+23
|/ / / | | | | | | | | | Signed-off-by: Dustin Falgout <dustin@falgout.us>
* | | Merge pull request #858 from TomasTomecek/improve-exec-apiDaniel Nephin2015-12-036-54/+94
|\ \ \ | |_|/ |/| | Improve exec api
| * | allow interactive execTomas Tomecek2015-12-035-53/+92
| | | | | | | | | | | | Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
| * | make,integration-dind: try to remove dpy-dindTomas Tomecek2015-12-021-0/+1
| | | | | | | | | | | | | | | | | | | | | b/c if test fails, dpy-dind is left running and integration-dind target will refuse to start and you need to manually force-remove the container Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
| * | tests,integration: ensure container is removed if start failsTomas Tomecek2015-12-021-1/+1
|/ / | | | | | | Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
* | Merge pull request #866 from ticosax/fix-volume-listingDaniel Nephin2015-12-012-1/+13
|\ \ | | | | | | fix typo filter param for `volumes`
| * | fix typo filter param for `volumes`Nicolas Delaby2015-12-012-1/+13
| |/ | | | | | | | | | | https://docs.docker.com/engine/reference/api/docker_remote_api_v1.21/#list-volumes Signed-off-by: Nicolas Delaby <nicolas.delaby@lock8.me>
* | Merge pull request #864 from ticosax/document-network_modeDaniel Nephin2015-12-011-2/+2
|\ \ | |/ |/| [doc] network_mode can also take the name of a network as value.
| * network_mode can also take the name of a network as value.Nicolas Delaby2015-12-011-2/+2
| | | | | | | | Signed-off-by: Nicolas Delaby <nicolas.delaby@lock8.me>
* | Merge pull request #862 from docker/1.6.0-release1.6.0Joffrey F2015-11-302-1/+40
|\ \ | | | | | | 1.6.0 release
| * | Update Changelog with one last bugfix1.6.0-releaseJoffrey F2015-11-301-1/+4
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | Bump versionJoffrey F2015-11-231-1/+1
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | Update ChangelogJoffrey F2015-11-231-0/+36
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | Merge pull request #861 from docker/860-deprecate-resolve-repo-nameJoffrey F2015-11-305-55/+101
|\ \ \ | |_|/ |/| | Update repo name resolution method
| * | Add tests for new cases covered by parse_repository_tag860-deprecate-resolve-repo-nameJoffrey F2015-11-241-14/+46
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
View Lorry Controller Status