summaryrefslogtreecommitdiff
path: root/docker
Commit message (Collapse)AuthorAgeFilesLines
* Fix enable_tls issue #984Joffrey F2016-03-111-4/+4
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge branch '935' of https://github.com/mdaue/docker-py into mdaue-935Joffrey F2016-03-091-0/+18
|\
| * Add ip4&ip6 (#935) support, network/id/connectMatt Daue2016-03-021-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | 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>
* 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-242-39/+68
|\ | | | | Support for container limits update
| * Improve parse_bytes util methodcontainer_update_featureJoffrey F2016-02-231-39/+35
| | | | | | | | 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>
| * New `update_container` methodJoffrey F2016-02-231-0/+32
| | | | | | | | | | | | Allows user to update container limits in-flight. Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #942 from seguins/934-separate-stream-follow-logsJoffrey F2016-02-241-2/+4
|\ \ | | | | | | Separate params stream and follow for logs.
| * | Separate params stream and follow for logs.Stéphane Seguin2016-02-161-2/+4
| | | | | | | | | | | | | | | | | | Closes #934 Signed-off-by: Stéphane Seguin <stephseguin93@gmail.com>
* | | Fix env vars with empty values.Daniel Nephin2016-02-241-1/+1
| | | | | | | | | | | | Signed-off-by: Daniel Nephin <dnephin@gmail.com>
* | | Merge pull request #952 from dnephin/fix_empty_env_varsJoffrey F2016-02-241-4/+9
|\ \ \ | |_|/ |/| | Format environment variables to match docker-cli.
| * | Format environment variables to match docker-cli.Daniel Nephin2016-02-231-4/+9
| | | | | | | | | | | | Signed-off-by: Daniel Nephin <dnephin@gmail.com>
* | | Back to dev versionJoffrey F2016-02-231-1/+1
|/ / | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Prepare 1.7.2 release1.7.2-releaseJoffrey F2016-02-231-1/+1
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Fix TLS regressionsAanand Prasad2016-02-232-3/+8
| | | | | | | | | | | | | | | | | | - Set `verify` to the CA cert path if one has been specified, rather than `True` - Don't set `assert_fingerprint` Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | Back to dev versionJoffrey F2016-02-221-1/+1
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Bumped version to 1.7.1Joffrey F2016-02-171-1/+1
|/ | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #928 from docker/926-ignored_dockerfilesJoffrey F2016-02-091-1/+7
|\ | | | | Never exclude Dockerfile from the build context.
| * Never exclude Dockerfile from the build context.926-ignored_dockerfilesJoffrey F2016-02-091-1/+7
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Don't break when parsing unknown config keys927-config-parsingJoffrey F2016-02-091-4/+19
|/ | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #920 from docker/ssl_version_simplerJoffrey F2016-02-052-17/+1
|\ | | | | Remove obsolete SSL version computation
| * 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>
* | Re-write kwargs_from_env to handle TLS options betterMike Dougherty2016-02-042-29/+40
| | | | | | | | | | | | | | | | This more closely matches the way the docker client interprets the relevant environment variables. Among other things, it's now possible to set DOCKER_TLS_VERIFY=false. Signed-off-by: Mike Dougherty <mike.dougherty@docker.com>
* | Merge pull request #923 from nubs/masterJoffrey F2016-02-041-1/+8
|\ \ | | | | | | Add support for shm_size.
| * | Add support for shm_size.Spencer Rinehart2016-02-041-1/+8
| | | | | | | | | | | | | | | | | | | | | --shm-size was added to Docker in 1.10 via docker/docker#16168. See docker/compose#2823 for more details. Signed-off-by: Spencer Rinehart <anubis@overthemonkey.com>
* | | Back to dev versionJoffrey F2016-02-041-1/+1
|/ / | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Bump to stable versionrelease-1.7.0Joffrey F2016-02-041-1/+1
|/ | | | | | Update ChangeLog 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>
View Lorry Controller Status