summaryrefslogtreecommitdiff
path: root/docker
Commit message (Collapse)AuthorAgeFilesLines
* Fix Swarm model init to correctly pass arguments through to init_swarm1359-swarm-initJoffrey F2017-01-251-6/+6
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #1410 from bayazee/masterJoffrey F2017-01-251-1/+0
|\ | | | | Remove duplicate line in exec_run documentation
| * Remove duplicate line in exec_run documentationMehdi Bayazee2017-01-251-1/+0
| | | | | | | | Signed-off-by: Mehdi Bayazee <bayazee@gmail.com>
* | Fix ImageNotFound detection1407-tar-ignore-socketsJoffrey F2017-01-251-1/+1
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Ignore socket files in utils.tarJoffrey F2017-01-241-2/+7
|/ | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Convert mode argument to valid structure in create_service1388-format-service-modeJoffrey F2017-01-193-5/+46
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #1398 from docker/docs-fixesJoffrey F2017-01-199-97/+95
|\ | | | | Fix a number of docs formatting issues
| * Fix a number of docs formatting issuesdocs-fixesJoffrey F2017-01-189-97/+95
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #1393 from aebm/masterJoffrey F2017-01-191-4/+4
|\ \ | | | | | | Fix #1351
| * | Fix #1351Alejandro E. Brito Monedero2017-01-161-4/+4
| |/ | | | | | | | | | | | | | | * Fix TypeError when getting the tags property from an image that has no tags. Ex: An image pulled by cryptohash. It is handled like when the image doesn't have defined the RepoTags member. Signed-off-by: Alejandro E. Brito Monedero <alejandro.monedero@gmail.com>
* | Merge pull request #1389 from docker/fix-stream-helperJoffrey F2017-01-181-26/+23
|\ \ | | | | | | Use json_stream function in decoded _stream_helper
| * | Use json_stream function in decoded _stream_helperfix-stream-helperJoffrey F2017-01-111-26/+23
| |/ | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #1347 from fcurella/hashBen Firshman2017-01-181-0/+3
|\ \ | |/ |/| Make resources hashable, so that they can be added to `set`s
| * Make resources hashable, so that they can be added to `set`sFlavio Curella2016-12-081-0/+3
| | | | | | | | Signed-off-by: Flavio Curella <flavio.curella@gmail.com>
* | Detect mount type in parse_mount_string1376-parse-mount-typeJoffrey F2017-01-091-1/+11
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Raise InvalidArgument exception when invalid arguments are provideddzimine-dz-fix-mount_optionsJoffrey F2017-01-092-6/+10
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge branch 'dz-fix-mount_options' of https://github.com/dzimine/docker-py ↵Joffrey F2017-01-091-1/+2
|\ \ | | | | | | | | | | | | | | | into dzimine-dz-fix-mount_options Signed-off-by: Joffrey F <joffrey@docker.com>
| * | Fix readonly in mounts.Dmitri2016-12-281-1/+2
| | | | | | | | | Signed-off-by: Dmitri Zimine dz@stackstorm.com
* | | Accept / as a path separator in dockerignore patterns on all platformscompose-4302-dockerignore-windowsJoffrey F2017-01-061-9/+17
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | Add filters option to NetworkApiMixin.networksLobsiinvok2017-01-051-7/+10
|/ / | | | | | | Signed-off-by: Boik <qazbnm456@gmail.com>
* | Bump version number to next devchangelog-updateJoffrey F2016-12-121-1/+1
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Bump version and update ChangelogJoffrey F2016-12-121-1/+1
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Rename non-URL occurrences of docker-py to "Docker SDK for Python"docker_sdk_renameJoffrey F2016-12-122-4/+5
|/ | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #1338 from docker/remove_nodeJoffrey F2016-12-072-0/+47
|\ | | | | Implement swarm node removal
| * Implement swarm node removalremove_nodeJoffrey F2016-12-072-0/+47
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #1340 from docker/dnephin-add-attachableJoffrey F2016-12-074-4/+21
|\ \ | | | | | | Add attachable option in create_network
| * | Update code and tests for Engine 1.13 compatibilitydnephin-add-attachableJoffrey F2016-12-073-2/+9
| | | | | | | | | | | | | | | | | | Makefile now runs tests against Docker 1.13 RC Signed-off-by: Joffrey F <joffrey@docker.com>
| * | Fix typo in create_networkJoffrey F2016-12-061-4/+5
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | Add attachable.Daniel Nephin2016-12-051-2/+11
| | | | | | | | | | | | 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-051-1/+2
|\ \ | | | | | | exec: fix running with detach=True
| * | exec: fix running with detach=TrueTomas Tomecek2016-11-291-1/+2
| | | | | | | | | | | | | | | | | | Fixes #1271 Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
* | | Merge pull request #1331 from aanand/fix-auth-config-path-windowsJoffrey F2016-12-021-12/+24
|\ \ \ | |_|/ |/| | Fix auth config path on Windows
| * | Fix auth config path on WindowsAanand Prasad2016-12-021-12/+24
| | | | | | | | | | | | | | | | | | | | | 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-024-7/+7
|\ \ \ | | | | | | | | Start to rename docker-py to docker-sdk-python
| * | | Start to rename docker-py to docker-sdk-pythonBen Firshman2016-11-284-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-021-1/+8
|\ \ \ \ | | | | | | | | | | Add options to IPAMConfig
| * | | | Add options to IPAMConfigwalkerlee-masterJoffrey F2016-12-021-1/+8
| | |/ / | |/| | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.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 branch 'patch-1' of https://github.com/manics/docker-py into ↵manics-patch-1Joffrey F2016-12-022-2/+6
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | manics-patch-1 Signed-off-by: Joffrey F <joffrey@docker.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 #1328 from docker/ssladapter_transport_moduleBen Firshman2016-12-024-7/+7
|\ \ \ \ \ | | | | | | | | | | | | Move ssladapter to transport module
| * | | | | Move ssladapter to transport modulessladapter_transport_moduleJoffrey F2016-12-014-7/+7
| | |/ / / | |/| | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | | Move config type creation from docker.utils functions to classes inconfig_typesJoffrey F2016-12-0112-701/+704
|/ / / / | | | | | | | | | | | | | | | | | | | | docker.types Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | Merge pull request #1303 from aanand/helpful-containers-warningBen Firshman2016-12-011-0/+6
|\ \ \ \ | | | | | | | | | | 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-281-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-308-11/+133
|\ \ \ \ \ | |_|_|_|/ |/| | | | Rename Client -> DockerClient
| * | | | Rename Client -> DockerClientdocker_clientJoffrey F2016-11-288-11/+133
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Replace references to old Client with APIClient Moved contents of services.md to appropriate locations Signed-off-by: Joffrey F <joffrey@docker.com>