summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | Merge pull request #1825 from docker/fix-context-buildingJoffrey F2017-12-111-7/+14
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | Fix common issues with build context creation: inaccessible files and FIFOs
| * | | | | | | | Fix common issues with build context creation: inaccessible files and fifosfix-context-buildingJoffrey F2017-11-291-7/+14
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | | | | | Merge pull request #1831 from asottile/patch-1Joffrey F2017-12-071-1/+2
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | container: fix docstring for containers()
| * | | | | | | container: fix docstring for containers()Anthony Sottile2017-12-071-1/+2
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Anthony Sottile <asottile@umich.edu>
* | | | | | | Merge pull request #1819 from alexvy86/alexvy86-patch-1Joffrey F2017-11-211-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add missing call to string format in log message
| * | | | | | | Add missing call to string format in log messageAlex Villarreal2017-11-211-1/+1
|/ / / / / / / | | | | | | | | | | | | | | Signed-off-by: Alejandro Villarreal <alex@alexvy86.com>
* | | | | | | Merge pull request #1798 from docker/unlock_swarm_supportJoffrey F2017-11-204-1/+70
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Unlock swarm support
| * | | | | | Add unlock methods to Swarm modelunlock_swarm_supportJoffrey F2017-11-073-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | | | | | Add unlock_swarm and get_unlock_key to APIClientJoffrey F2017-11-072-1/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | | | | Merge pull request #1805 from thaJeztah/fix-swarm-update-testJoffrey F2017-11-131-18/+0
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Remove test_update_swarm_name
| * | | | | | Remove test_update_swarm_nameSebastiaan van Stijn2017-11-141-18/+0
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docker currently only supports the "default" cluster in Swarm-mode, and an upcoming SwarmKit release will produce an error if the name of the cluster is updated, causing the test to fail. Given that renaming the cluster is not supported, this patch removes the test Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* | | | | | dev versionJoffrey F2017-11-081-1/+1
| |_|_|_|/ |/| | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | | Merge pull request #1802 from docker/2.6.1-release2.6.1Joffrey F2017-11-083-8/+18
|\ \ \ \ \ | | | | | | | | | | | | 2.6.1 release
| * | | | | 2.6.1 release2.6.1-releaseJoffrey F2017-11-082-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | | | | dev versionJoffrey F2017-11-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | | | | Merge branch 'release' of github.com:docker/docker-pyJoffrey F2017-11-083-2/+57
| |\ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | | | Update test engine versions in Jenkinsfile2.6.0Joffrey F2017-11-073-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> Conflicts: Jenkinsfile
* | | | | | Bump 2.6.0Joffrey F2017-11-072-1/+45
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | | | Style fixes. Copied docs to APIClient as wellJoffrey F2017-11-072-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | | | explain the socket parameter of exec_runMartin Monperrus2017-11-071-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Martin Monperrus <martin.monperrus@gnieh.org>
* | | | | | Add support for insert_defaults in inspect_serviceJoffrey F2017-11-073-5/+33
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | | | Update SwarmSpec to include new parametersJoffrey F2017-11-075-18/+160
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | | | Add support for scope filter in inspect_networkJoffrey F2017-11-073-4/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix missing scope implementation in create_network Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | | | OopsJoffrey F2017-11-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | | | Fix build tests to not rely on internet connectivityJoffrey F2017-11-071-10/+20
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | | | Disable buffering based on presence of Connection Upgrade headersJoffrey F2017-11-072-37/+35
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | | | Prevent data loss when attaching to containerChris Harris2017-11-071-3/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The use of buffering within httplib.HTTPResponse can cause data to be lost. socket.makefile() is called without a bufsize, which causes a buffer to be used when recieving data. The attach methods do a HTTP upgrade to tcp before the raw socket is using to stream data from the container. The problem is that if the container starts stream data while httplib/http.client is reading the response to the attach request part of the data ends will end up in the buffer of fileobject created within the HTTPResponse object. This data is lost as after the attach request data is read directly from the raw socket. Signed-off-by: Chris Harris <chris.harris@kitware.com>
* | | | | | Doc fixesJoffrey F2017-11-074-20/+22
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | | | Add support for secret driver in create_secretJoffrey F2017-11-071-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | | | Improve docs for service list filtersAlessandro Baldo2017-11-073-4/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - add "label" and "mode" to the list of available filter keys in the high-level service API - add "label" and "mode" to the list of available filter keys in the low-level service API - add integration tests Signed-off-by: Alessandro Baldo <git@baldoalessandro.net>
* | | | | | More ContainerSpec testsJoffrey F2017-11-074-32/+69
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | | | Add support for configs managementJoffrey F2017-11-0711-3/+464
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | | | Add support for new ContainerSpec parametersJoffrey F2017-11-0710-50/+265
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | | | Fix indentation in docstringErik Johnson2017-11-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The incorrect indentation causes improper formatting when the docs are published. Signed-off-by: Erik Johnson <palehose@gmail.com>
* | | | | | Add support for extra_hosts option in buildJoffrey F2017-11-073-1/+50
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | | | Pin flake8 versionJoffrey F2017-11-072-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | | | Add support for mounts in HostConfigJoffrey F2017-11-074-1/+80
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | | | Add support for new types and options to docker.types.MountJoffrey F2017-11-071-14/+41
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | | | Fix simple documentation copy/paste error.Jan Losinski2017-11-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan Losinski <losinski@wh2.tu-dresden.de>
* | | | | | Remove superfluous version validationJoffrey F2017-11-071-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | | | Adding swarm id_attribute to match docker outputSteve Clark2017-11-072-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Swarm id is returned in a attribute with the key ID. The swarm model was using the default behaviour and looking for Id. Signed-off-by: Steve Clark <steve@cobe.io>
* | | | | | Fix docs, incorrect param namebrett552017-11-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: brett55 <bjcull2@gmail.com>
* | | | | | Do not interrupt streaming when encountering 0-length framesJoffrey F2017-11-072-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | | | Fix prune_images docstringJoffrey F2017-11-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | | | Use unambiguous advertise-addr when initializing a swarmJoffrey F2017-11-076-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | | | Shift test matrix forwardJoffrey F2017-11-071-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | | | Bump 2.5.12.5.1Joffrey F2017-08-222-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | | | Always send attach request as streamingJoffrey F2017-08-222-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | | | Commit d798afca made changes for the handling of '**' patterns inVeli-Matti Lintu2017-08-222-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | .dockerignore. This causes an IndexError with patterns ending with '**', e.g. 'subdir/**'. This adds a missing boundary check before checking for trailing '/'. Signed-off-by: Veli-Matti Lintu <veli-matti.lintu@nosto.com>
* | | | | | Bump 2.6.0-devJoffrey F2017-08-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>