summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Accept / as a path separator in dockerignore patterns on all platformscompose-4302-dockerignore-windowsJoffrey F2017-01-062-9/+35
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #1362 from qazbnm456/add_filters_to_networksJoffrey F2017-01-051-7/+10
|\ | | | | Add filters option to NetworkApiMixin.networks
| * Add filters option to NetworkApiMixin.networksLobsiinvok2017-01-051-7/+10
|/ | | | Signed-off-by: Boik <qazbnm456@gmail.com>
* Merge pull request #1350 from docker/changelog-updateJoffrey F2016-12-123-5/+120
|\ | | | | Changelog update
| * Bump version number to next devchangelog-updateJoffrey F2016-12-121-1/+1
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * Remove development version warning from READMEJoffrey F2016-12-121-4/+0
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * Bump version and update ChangelogJoffrey F2016-12-122-1/+120
|/ | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #1332 from docker/docker_sdk_renameJoffrey F2016-12-125-22/+24
|\ | | | | Rename all meaningful occurrences of docker-py to docker-sdk-python
| * Rename non-URL occurrences of docker-py to "Docker SDK for Python"docker_sdk_renameJoffrey F2016-12-125-22/+24
|/ | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #1342 from docker/jenkinsfileJoffrey F2016-12-088-19/+121
|\ | | | | Add Jenkinsfile for integration tests matrix
| * Prevent Swarm address conflictsjenkinsfileJoffrey F2016-12-088-28/+48
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * Add Jenkinsfile for integration tests matrixJoffrey F2016-12-081-0/+82
|/ | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #1338 from docker/remove_nodeJoffrey F2016-12-073-0/+64
|\ | | | | Implement swarm node removal
| * Implement swarm node removalremove_nodeJoffrey F2016-12-073-0/+64
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #1340 from docker/dnephin-add-attachableJoffrey F2016-12-0711-24/+75
|\ \ | | | | | | Add attachable option in create_network
| * | Update code and tests for Engine 1.13 compatibilitydnephin-add-attachableJoffrey F2016-12-0711-27/+53
| | | | | | | | | | | | | | | | | | Makefile now runs tests against Docker 1.13 RC Signed-off-by: Joffrey F <joffrey@docker.com>
| * | Fix typo in create_networkJoffrey F2016-12-062-4/+16
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | Add attachable.Daniel Nephin2016-12-052-2/+15
| | | | | | | | | | | | Signed-off-by: Daniel Nephin <dnephin@gmail.com>
* | | Merge pull request #1339 from docker/min_version_1.21Ben Firshman2016-12-061-1/+1
|\ \ \ | |/ / |/| | Minimum version 1.24 -> 1.21
| * | Minimum version 1.24 -> 1.21min_version_1.21Joffrey F2016-12-051-1/+1
| |/ | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #1272 from TomasTomecek/1271-fix-detach-in-exec-startBen Firshman2016-12-052-1/+17
|\ \ | | | | | | exec: fix running with detach=True
| * | exec: fix running with detach=TrueTomas Tomecek2016-11-292-1/+17
| | | | | | | | | | | | | | | | | | Fixes #1271 Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
* | | Merge pull request #1331 from aanand/fix-auth-config-path-windowsJoffrey F2016-12-022-12/+77
|\ \ \ | |_|/ |/| | Fix auth config path on Windows
| * | Fix auth config path on WindowsAanand Prasad2016-12-022-12/+77
| | | | | | | | | | | | | | | | | | | | | The Engine client looks *only* at the USERPROFILE environment variable on Windows, so we should do that too. Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | | Merge pull request #1315 from bfirsh/rename-docker-py-to-docker-sdk-pythonJoffrey F2016-12-029-37/+37
|\ \ \ | | | | | | | | Start to rename docker-py to docker-sdk-python
| * | | Start to rename docker-py to docker-sdk-pythonBen Firshman2016-11-289-37/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pretty much everything except renaming the GitHub repo and documentation, which is not actually done yet. Nearer the release we can do a search/replace for all that stuff. Ref #1310 Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* | | | Merge pull request #1330 from docker/walkerlee-masterJoffrey F2016-12-022-2/+9
|\ \ \ \ | | | | | | | | | | Add options to IPAMConfig
| * | | | Add options to IPAMConfigwalkerlee-masterJoffrey F2016-12-021-1/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | | | Merge branch 'master' of https://github.com/walkerlee/docker-py into ↵Joffrey F2016-12-021-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | walkerlee-master Signed-off-by: Joffrey F <joffrey@docker.com>
| | * | | | Add docker network IPAM options parameterWalker Lee2016-10-274-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Walker Lee <walkerlee.tw@gmail.com>
* | | | | | Merge pull request #1327 from docker/compose4171_build_auth_headersJoffrey F2016-12-021-3/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | Properly fill out auth headers in APIClient.build when using a credstore
| * | | | | | Properly fill out auth headers in APIClient.build when usingcompose4171_build_auth_headersJoffrey F2016-12-011-3/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a credentials store Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | | | | Merge pull request #1329 from docker/manics-patch-1Joffrey F2016-12-023-2/+22
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Use format_environment to convert env in ContainerSpec
| * | | | | | Merge branch 'patch-1' of https://github.com/manics/docker-py into ↵manics-patch-1Joffrey F2016-12-023-2/+22
| |\ \ \ \ \ \ |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | manics-patch-1 Signed-off-by: Joffrey F <joffrey@docker.com>
| * | | | | | Add test for creating service with envSimon Li2016-11-111-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon Li <orpheus+devel@gmail.com>
| * | | | | | Use format_environment to convert env in ContainerSpecSimon Li2016-11-112-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon Li <orpheus+devel@gmail.com>
* | | | | | | Merge pull request #1324 from docker/requests_2.12.2Joffrey F2016-12-021-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | Exclude requests==2.12.2 from dependencies
| * | | | | | Exclude requests==2.12.2 from dependenciesrequests_2.12.2Joffrey F2016-11-301-1/+1
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | | | Merge pull request #1328 from docker/ssladapter_transport_moduleBen Firshman2016-12-025-8/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | Move ssladapter to transport module
| * | | | | | Move ssladapter to transport modulessladapter_transport_moduleJoffrey F2016-12-015-8/+8
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | | | Merge pull request #1319 from docker/config_typesBen Firshman2016-12-0218-973/+999
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Move config type creation from docker.utils functions to classes in docker.types
| * | | | | Move config type creation from docker.utils functions to classes inconfig_typesJoffrey F2016-12-0119-974/+1000
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | docker.types Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | | | Client -> DockerClientJoffrey F2016-12-011-1/+1
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | | Merge pull request #1303 from aanand/helpful-containers-warningBen Firshman2016-12-012-0/+17
|\ \ \ \ \ | | | | | | | | | | | | Show a helpful warning when people try to call `client.containers()`
| * | | | | Show a helpful warning when people try to call `client.containers()`Aanand Prasad2016-11-282-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | People upgrading to docker-py 2.0 without being aware of the new client API will likely try to call the old `containers()` method. This adds a helpful warning telling them to use APIClient to get the old API. Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | | | | | Merge pull request #1308 from docker/docker_clientJoffrey F2016-11-3014-287/+206
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Rename Client -> DockerClient
| * | | | | Rename Client -> DockerClientdocker_clientJoffrey F2016-11-2814-287/+206
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace references to old Client with APIClient Moved contents of services.md to appropriate locations Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | | | Merge pull request #1277 from ↵Ben Firshman2016-11-292-20/+107
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | bodnarbm/do-not-traverse-ignored-directories-with-no-potential-exceptions Do not traverse excluded directories that are not prefixes of dockerignore exceptions.
| * | | | | | Add unit tests for should_check_directory.Brandon Bodnar2016-11-261-1/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Brandon Bodnar <bodnarbm@gmail.com>
| * | | | | | Prevent traversing excluded directories with no possible dockerignore exceptionsBrandon Bodnar2016-11-261-19/+32
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes an issue where all files in a rather large excluded folder are traversed and examined when creating the build context for potential exception to the exclusion, even though the exclusion rule is for a completely unrelated folder. Signed-off-by: Brandon Bodnar <bodnarbm@gmail.com>
View Lorry Controller Status