summaryrefslogtreecommitdiff
path: root/docker
Commit message (Collapse)AuthorAgeFilesLines
* Remove obsolete SSL version computationssl_version_simplerJoffrey F2016-02-032-17/+1
| | | | | | | | Recent versions of urllib3 (including the one packaged by requests) will automatically reject SSLv2/3. Additional test to check urllib3's behavior (mostly for release/packaging) Signed-off-by: Joffrey F <joffrey@docker.com>
* Update outdated error message914_hostconfig_startJoffrey F2016-01-291-1/+1
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Support unspecified protocol in base_url when using TLS894-docker_host_envJoffrey F2016-01-282-6/+6
| | | | | | (assume HTTPS) Signed-off-by: Joffrey F <joffrey@docker.com>
* Bump RC1.7.0-rc3Joffrey F2016-01-261-1/+1
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Raise exceptions for API errors on network connect/disconnectAanand Prasad2016-01-251-2/+4
| | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* Bumped RC1.7.0rc2Joffrey F2016-01-211-1/+1
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Support links when creating containers or connecting to networksAanand Prasad2016-01-203-10/+19
| | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* 1.7.0 release candidate1.7.0-rc1rc_1.7.0Joffrey F2016-01-181-1/+1
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #880 from docker/813-parse-float-bytesJoffrey F2016-01-181-11/+18
|\ | | | | Handle 64-bit integer values in parse_bytes
| * parse_bytes: Add ability to handle 64-bit integers in py2Joffrey F2016-01-181-11/+18
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Add HttpHeaders support in load_configPavel Kravchenko2016-01-184-5/+25
|/ | | | Signed-off-by: Pavel Kravchenko <kpavel@il.ibm.com>
* Improve host devices supportJoffrey F2016-01-182-6/+15
| | | | | | | | Add unit tests for utils.parse_devices Rewrite documentation Support dict and string format for device declaration Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #898 from docker/https_docs_linkJoffrey F2016-01-182-3/+3
|\ | | | | Update HTTPS docs link
| * Update HTTPS docs linkhttps_docs_linkJoffrey F2016-01-182-3/+3
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Normalise/fix networking API JSON keysAanand Prasad2016-01-182-10/+10
|/ | | | | | | - Use CamelCase - `auxaddresses` -> `AuxiliaryAddresses` Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* Implement support for network-scoped aliasesAanand Prasad2016-01-144-6/+39
| | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* 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>
* allow custom ipam options when creating networksRyan Belgrave2016-01-043-3/+22
| | | | Signed-off-by: Ryan Belgrave <rmb1993@gmail.com>
* Merge pull request #863 from thomasboyt/fast-exclude-pathsAanand Prasad2015-12-161-21/+51
|\ | | | | Don't descend into ignored directories when building context
| * Improve get_paths performance by not descending into ignored directoriesThomas Boyt2015-12-081-21/+51
| | | | | | | | Signed-off-by: Thomas Boyt <thomas@ledgerx.com>
* | Treat 'index.docker.io' repo names as 'docker.io'Aanand Prasad2015-12-101-4/+11
| | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | Refactor resolve_authconfig testsAanand Prasad2015-12-101-6/+1
| | | | | | | | | | | | | | 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>
* | Bumped versionJoffrey F2015-12-091-1/+1
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Fix remove_volume return valueSumit Sahrawat2015-12-101-1/+0
| | | | | | | | Signed-off-by: Sumit Sahrawat <sumit.sahrawat.apm13@iitbhu.ac.in>
* | Allow providing options when creating networksSumit Sahrawat2015-12-101-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-082-3/+10
|\ \ | | | | | | added stop_signal to create container config
| * | added stop_signal to create container configJonathan Stewmon2015-12-032-3/+10
| | | | | | | | | | | | 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>
* | | incorporate feedbackDustin Falgout2015-12-041-30/+40
| | | | | | | | | | | | Signed-off-by: Dustin Falgout <dustin@falgout.us>
* | | Use new methods to raise exceptions in create_host_config.Dustin Falgout2015-12-031-36/+13
| | | | | | | | | | | | | | | | | | | | | 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>
* | | allow interactive execTomas Tomecek2015-12-032-6/+13
| |/ |/| | | | | Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
* | fix typo filter param for `volumes`Nicolas Delaby2015-12-011-1/+1
|/ | | | | | 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 #862 from docker/1.6.0-release1.6.0Joffrey F2015-11-301-1/+1
|\ | | | | 1.6.0 release
| * Bump versionJoffrey F2015-11-231-1/+1
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #861 from docker/860-deprecate-resolve-repo-nameJoffrey F2015-11-303-34/+27
|\ \ | | | | | | Update repo name resolution method
| * | Update auth.resolve_repository_nameJoffrey F2015-11-233-34/+27
| |/ | | | | | | | | | | | | | | | | | | | | More relaxed version that matches the constraints imposed by the current version of the docker daemon. Few unit tests to verify the new cases. Client.pull was trying to set the tag value when it wasn't supposed to, fixed now. utils.parse_repository_tag is simpler and supports @sha... notation Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #841 from delfick/proxy_pool_manager_assert_hostnameJoffrey F2015-11-241-0/+13
|\ \ | |/ |/| Ensure assert_hostname is set on the pool connection
| * Ensure assert_hostname is set on the pool connectionStephen Moore2015-11-081-0/+13
| | | | | | | | | | | | | | | | If you have assert_hostname turned off and are using a proxy on your computer then assert_hostname wasn't being properly set on the pool connection and it was failing to connect to docker Signed-off-by: Stephen Moore <stephen@delfick.com>
* | Merge branch 'oom-kill-disable-pr' of https://github.com/schu/docker-py into ↵Joffrey F2015-11-181-10/+17
|\ \ | | | | | | | | | schu-oom-kill-disable-pr
| * | create_host_config: allow setting oom_kill_disableMichael Schubert2015-11-101-1/+8
| |/ | | | | | | Signed-off-by: Michael Schubert <schu@schu.io>
* | Merge pull request #832 from aebm/masterJoffrey F2015-11-181-1/+1
|\ \ | | | | | | Fix #627
| * | Fix #627Alejandro Brito Monedero2015-10-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docker-py couldn't pull private images if the account have non ascii chars in either user or password. It that case an exception ending with no auth credentials. Instead docker client (golang) don't suffer this issue. Also add a test to check the login or password even with non ascii char have a valid auth dictionary Signed-off-by: Alejandro Brito Monedero <abrito@alea-soluciones.com>
* | | Merge pull request #805 from sourcelair/enhancement/stats-no-streamDaniel Nephin2015-11-171-2/+7
|\ \ \ | | | | | | | | Add support for non-stream stats of containers
| * | | Add suport for non-stream stats of containersAntonis Kalipetis2015-10-221-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds one more flag to the `stats` method for streaming responses. Keeps default as streamed response for backwards compatibility. Signed-off-by: Antonis Kalipetis <akalipetis@gmail.com>
* | | | Merge pull request #834 from lots0logs/814-host-config-mem-swapDaniel Nephin2015-11-161-10/+24
|\ \ \ \ | | | | | | | | | | Add support for MemorySwappiness to client.create_host_config()
| * | | | Incorporates feedback from and closes #814Dustin Falgout2015-11-051-10/+24
| | |/ / | |/| | | | | | | | | | Signed-off-by: Dustin Falgout <dustin@falgout.us>
* | | | Merge pull request #796 from v-boyko/feature/logs_sinceDaniel Nephin2015-11-122-2/+14
|\ \ \ \ | | | | | | | | | | Support the 'since' option in the 'containers/<id>/logs' endpoint (API upgrade)
| * \ \ \ Merge upstream branch 'master' into feature/logs_sinceViacheslav Boiko2015-11-0511-75/+208
| |\ \ \ \ | | |/ / / | | | | | | | | | | Signed-off-by: Viacheslav Boiko <v.e.boyko@gmail.com>