summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | Fix handling of non-multiplexed (TTY) streams over upgraded socketsJoffrey F2017-08-176-11/+42
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge branch 'gferon-experimental-flags'Joffrey F2017-08-152-2/+39
|\ \ | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | Add support for the `squash` flag when buildingGabriel Féron2017-08-152-2/+39
|/ / | | | | | | | | | | Also added a test that compares the number of layers in the default mode, and with the new flag Signed-off-by: Gabriel Féron <feron.gabriel@gmail.com>
* | Merge branch 'master' of github.com:docker/docker-pyJoffrey F2017-08-153-2/+19
|\ \
| * | Use collection's get method inside ImageCollection's list methodadrianliaw2017-08-151-1/+1
| | | | | | | | | | | | Signed-off-by: Adrian Liaw <adrianliaw2000@gmail.com>
| * | Handle untyped ContainerSpec dict in _check_api_featuresJoffrey F2017-08-152-1/+18
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | Merge branch 'davidsteines-1477_detach_and_remove_together'Joffrey F2017-08-152-2/+37
|\ \ \ | |/ / |/| |
| * | Use better version comparison functionJoffrey F2017-08-151-3/+2
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | Allow detach and remove for api version >= 1.25 and use auto_remove when ↵David Steines2017-08-152-2/+38
|/ / | | | | | | | | | | both are set. Continue raising an exception for api versions <1.25. Signed-off-by: David Steines <d.steines@gmail.com>
* | Daemon expects full URL of hub in auth config dict in build payloadJoffrey F2017-08-152-3/+6
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Upgrade tox and virtualenv in appveyor to make sure we have the latest pip.Ying2017-08-151-1/+1
| | | | | | | | Signed-off-by: Ying <ying.li@docker.com>
* | If we're pinning exact versions of things for requirements.txt, pincyli2017-08-152-8/+18
| | | | | | | | | | | | all dependencies of dependencies as well so we can get a consistent build. Signed-off-by: cyli <cyli@twistedmatrix.com>
* | Require "requests[security]" if the `[tls]` option is selected, which also ↵cyli2017-08-153-1/+15
| | | | | | | | | | | | | | | | | | | | | | installs: pyOpenSSL, cryptography, idna and installs cryptography's version of openssl in Mac OS (which by default has an ancient version of openssl that doesn't support TLS 1.2). Signed-off-by: cyli <cyli@twistedmatrix.com>
* | Leading slash in .dockerignore should be ignoredJoffrey F2017-08-152-0/+6
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Return generator for output of load_image endpointJoffrey F2017-08-155-6/+58
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Return the result of the API when using remove_image and load_imageCecile Tonglet2017-08-152-3/+4
| | | | | | | | | | | | Those calls return result that can be used by the developers. Signed-off-by: Cecile Tonglet <cecile.tonglet@gmail.com>
* | Merge branch 'bolshakov-bugfix/run-container-with-syslog-driver'Joffrey F2017-08-075-4/+77
|\ \ | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | Improve ContainerError message computeJoffrey F2017-08-071-6/+3
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | client.containers.run returns None if none of json-file or journald logging ↵Artem Bolshakov2017-08-075-4/+80
|/ / | | | | | | | | | | drivers used Signed-off-by: Artem Bolshakov <either.free@gmail.com>
* | Added wait to the Container class documentation.Andreas Backx2017-08-071-0/+1
| | | | | | | | | | The container class documentation did not automatically document the `Container.wait` method. Signed-off-by: Andreas Backx <andreas@backx.org>
* | Fix domainname documentation in create_container functionErik Johnson2017-08-071-1/+1
| | | | | | | | | | | | | | It looks like this was probably originally copypasta'ed from dns_search and not edited afterward. Signed-off-by: Erik Johnson <palehose@gmail.com>
* | Temporarily - do not run py33 tests on travisJoffrey F2017-08-011-1/+2
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Generating regexp from .dockerignore file in a similar way as docker-ce.Jakub Goszczurny2017-08-012-8/+44
| | | | | | | | Signed-off-by: Jakub Goszczurny <szczurmys@o2.pl>
* | client.networks.create check_duplicates docs not reflective of behaviorDima Spivak2017-07-311-1/+1
| | | | | | | | | | | | Fixes #1693 Signed-off-by: Dima Spivak <dima@spivak.ch>
* | By not specifying a specific tag, the example would download every Ubuntu ↵Brandon Jackson2017-07-181-1/+1
| | | | | | | | | | | | | | | | tag that exists. This oversight caused my machine to run out of disk space holding all the image diffs. Signed-off-by: Brandon Jackson <usbrandon@gmail.com>
* | Fix #1673 check resource error in container network APIMatthew Berry2017-07-142-5/+5
| | | | | | | | | | | | | | | | Container network functions checked 'image' as resource ID and not 'container'. This caused a traceback when using container as named argument. Signed-off-by: Matthew Berry <mtberry89@gmail.com>
* | Merge pull request #1664 from docker/jfile-17.06-rcJoffrey F2017-07-031-3/+3
|\ \ | | | | | | Shift test matrix forward
| * | Shift test matrix forwardjfile-17.06-rcJoffrey F2017-06-271-3/+3
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | Merge pull request #1671 from shin-/1668-split-port-2Joffrey F2017-06-281-0/+5
|\ \ \ | | | | | | | | Compose 1.14.0 hack - split_port fix
| * | | Compose 1.14.0 hackJoffrey F2017-06-281-0/+5
|/ / / | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | Merge pull request #1669 from shin-/1668-split-portJoffrey F2017-06-282-0/+4
|\ \ \ | | | | | | | | split_port should not break when passed a non-string argument
| * | | split_port should not break when passed a non-string argumentJoffrey F2017-06-282-0/+4
|/ / / | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | Merge pull request #1667 from docker/bump-2.5.0-devJoffrey F2017-06-273-1/+40
|\ \ \ | |/ / |/| | Bump 2.5.0 dev
| * | dev versionJoffrey F2017-06-271-1/+1
| |/ | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * Merge pull request #1665 from docker/2.4.0-release2.4.0Joffrey F2017-06-2741-214/+629
| |\ | | | | | | 2.4.0 release
| | * Bump 2.4.02.4.0-releaseJoffrey F2017-06-223-1/+40
| |/ |/| | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #1661 from shin-/1622-service-ttyJoffrey F2017-06-224-1/+29
|\ \ | | | | | | Add support for ContainerSpec.TTY
| * | Add support for ContainerSpec.TTYJoffrey F2017-06-214-1/+29
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | Merge pull request #1662 from docker/1633-credhelpers-supportJoffrey F2017-06-222-7/+74
|\ \ \ | | | | | | | | Support credHelpers section in config.json
| * | | Support credHelpers section in config.json1633-credhelpers-supportJoffrey F2017-06-222-7/+74
| |/ / | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | Merge pull request #1663 from ↵Joffrey F2017-06-221-2/+2
|\ \ \ | | | | | | | | | | | | | | | | shin-/qazbnm456-correct_description_of_dns_opt_of_create_container Correct the description of dns_opt option of create_container
| * | | Correct the description of dns_opt option of create_containerBoik2017-06-221-2/+2
|/ / / | | | | | | | | | Signed-off-by: Boik <qazbnm456@gmail.com>
* | | Merge pull request #1640 from zero57/add_attrs_for_picklingJoffrey F2017-06-224-0/+20
|\ \ \ | |/ / |/| | Add attributes for pickling
| * | Add attributes for picklingAn Ha2017-06-204-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | When using the multiprocessing module, it throws an AttributeError, complaining that the object does not have the attribute used. This adds the missing attributes and allows them to be pickled. Signed-off-by: An Ha <zero579911@gmail.com>
* | | Merge pull request #1658 from docker/1397-build-networkJoffrey F2017-06-203-10/+56
|\ \ \ | | | | | | | | Add network_mode support to Client.build
| * | | Add network_mode support to Client.build1397-build-networkJoffrey F2017-06-193-10/+56
| |/ / | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | Merge pull request #1659 from docker/moby33735Joffrey F2017-06-201-1/+3
|\ \ \ | |/ / |/| | Make sure data is written in prune test so space can be reclaimed
| * | Make sure data is written in prune test so space can be reclaimedmoby33735Joffrey F2017-06-201-1/+3
|/ / | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #1626 from datwiz/images-build-error-1625Joffrey F2017-06-192-3/+15
|\ \ | | | | | | fix #1625 where ImageCollection.build() could return with incorrect image id
| * | new integration task linting for #1625Chris Ottinger2017-05-271-2/+2
| | | | | | | | | | | | Signed-off-by: Chris Ottinger <chris.ottinger@team.telstra.com>
View Lorry Controller Status