Commit Graph

2311 Commits

Author SHA1 Message Date
Gabriel Féron 76eb0298c6 Add support for the `squash` flag when building
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>
2017-08-15 18:09:39 -07:00
Joffrey F fe2e120705 Merge branch 'master' of github.com:docker/docker-py 2017-08-15 17:42:51 -07:00
Joffrey F 67b58b81e0 Merge branch 'davidsteines-1477_detach_and_remove_together' 2017-08-15 17:42:16 -07:00
Joffrey F b78fa6405a Use better version comparison function
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-15 17:40:07 -07:00
David Steines e17a545aa5 Allow detach and remove for api version >= 1.25 and use auto_remove when both are set. Continue raising an exception for api versions <1.25.
Signed-off-by: David Steines <d.steines@gmail.com>
2017-08-15 17:38:34 -07:00
adrianliaw 05e5db5853 Use collection's get method inside ImageCollection's list method
Signed-off-by: Adrian Liaw <adrianliaw2000@gmail.com>
2017-08-15 17:37:04 -07:00
Joffrey F 18acd569a1 Handle untyped ContainerSpec dict in _check_api_features
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-15 17:22:25 -07:00
Joffrey F e9fab1432b Daemon expects full URL of hub in auth config dict in build payload
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-15 15:59:33 -07:00
Ying 35f29d08d7 Upgrade tox and virtualenv in appveyor to make sure we have the latest pip.
Signed-off-by: Ying <ying.li@docker.com>
2017-08-15 15:45:51 -07:00
cyli c163375591 If we're pinning exact versions of things for requirements.txt, pin
all dependencies of dependencies as well so we can get a consistent build.

Signed-off-by: cyli <cyli@twistedmatrix.com>
2017-08-15 15:45:51 -07:00
cyli 3b95da3ea4 Require "requests[security]" if the `[tls]` option is selected, which also 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>
2017-08-15 15:45:51 -07:00
Joffrey F 92a2e48e17 Leading slash in .dockerignore should be ignored
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-15 15:40:16 -07:00
Joffrey F 5e4a69bbda Return generator for output of load_image endpoint
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-15 14:58:29 -07:00
Cecile Tonglet 56dc7db069 Return the result of the API when using remove_image and load_image
Those calls return result that can be used by the developers.

Signed-off-by: Cecile Tonglet <cecile.tonglet@gmail.com>
2017-08-15 14:43:32 -07:00
Joffrey F 369168e29c Merge branch 'bolshakov-bugfix/run-container-with-syslog-driver'
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-07 12:06:42 -07:00
Joffrey F 8bcf2f27fb Improve ContainerError message compute
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-07 12:06:07 -07:00
Artem Bolshakov b8fd821336 client.containers.run returns None if none of json-file or journald logging drivers used
Signed-off-by: Artem Bolshakov <either.free@gmail.com>
2017-08-07 12:02:02 -07:00
Andreas Backx 1a923c561f Added wait to the Container class documentation.
The container class documentation did not automatically document the `Container.wait` method.

Signed-off-by: Andreas Backx <andreas@backx.org>
2017-08-07 11:49:51 -07:00
Erik Johnson 8a6b168467 Fix domainname documentation in create_container function
It looks like this was probably originally copypasta'ed from dns_search
and not edited afterward.

Signed-off-by: Erik Johnson <palehose@gmail.com>
2017-08-07 11:49:21 -07:00
Joffrey F bcfd6dadd1 Temporarily - do not run py33 tests on travis
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-01 13:49:48 -07:00
Jakub Goszczurny d798afca7e Generating regexp from .dockerignore file in a similar way as docker-ce.
Signed-off-by: Jakub Goszczurny <szczurmys@o2.pl>
2017-08-01 13:47:45 -07:00
Dima Spivak c2925a384b client.networks.create check_duplicates docs not reflective of behavior
Fixes #1693

Signed-off-by: Dima Spivak <dima@spivak.ch>
2017-07-31 15:40:41 -07:00
Brandon Jackson d68996f953 By not specifying a specific tag, the example would download every Ubuntu 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>
2017-07-18 11:20:52 -07:00
Matthew Berry c9960c78b0 Fix #1673 check resource error in container network API
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>
2017-07-14 09:31:16 -07:00
Joffrey F 6fe1c7f18f Merge pull request #1664 from docker/jfile-17.06-rc
Shift test matrix forward
2017-07-03 16:33:18 -07:00
Joffrey F eb0d80646a Merge pull request #1672 from docker/2.4.2-release
2.4.2 release
2017-06-28 13:41:57 -07:00
Joffrey F 43f87e9f63 Bump 2.4.2
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-06-28 13:32:18 -07:00
Joffrey F 14e6184814 Compose 1.14.0 hack
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-06-28 13:31:46 -07:00
Joffrey F 03b78b8152 Merge pull request #1671 from shin-/1668-split-port-2
Compose 1.14.0 hack - split_port fix
2017-06-28 13:30:53 -07:00
Joffrey F 48957e726b Compose 1.14.0 hack
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-06-28 13:26:04 -07:00
Joffrey F 65e01f24e4 Merge pull request #1670 from docker/2.4.1-release
2.4.1 release
2017-06-28 12:38:05 -07:00
Joffrey F 3d84dbee59 Bump 2.4.1
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-06-28 12:25:10 -07:00
Joffrey F 50a60717f0 split_port should not break when passed a non-string argument
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-06-28 12:22:34 -07:00
Joffrey F 9d09a137f5 Merge pull request #1669 from shin-/1668-split-port
split_port should not break when passed a non-string argument
2017-06-28 12:21:35 -07:00
Joffrey F a8722fb0c2 split_port should not break when passed a non-string argument
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-06-28 12:06:03 -07:00
Joffrey F e1344382a7 Merge pull request #1667 from docker/bump-2.5.0-dev
Bump 2.5.0 dev
2017-06-27 18:07:30 -07:00
Joffrey F f611eaf9e3 dev version
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-06-27 18:06:12 -07:00
Joffrey F 706e2cad65 Merge pull request #1665 from docker/2.4.0-release
2.4.0 release
2017-06-27 17:56:28 -07:00
Joffrey F f4a4982ae0 Shift test matrix forward
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-06-27 12:28:16 -07:00
Joffrey F 1ad6859600 Bump 2.4.0
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-06-22 17:17:13 -07:00
Joffrey F 15030cb680 Merge pull request #1661 from shin-/1622-service-tty
Add support for ContainerSpec.TTY
2017-06-22 16:39:35 -07:00
Joffrey F be8c144841 Merge pull request #1662 from docker/1633-credhelpers-support
Support credHelpers section in config.json
2017-06-22 16:39:08 -07:00
Joffrey F 28e76a6fbc Merge pull request #1663 from shin-/qazbnm456-correct_description_of_dns_opt_of_create_container
Correct the description of dns_opt option of create_container
2017-06-22 12:39:32 -07:00
Boik 015fe1cf5e Correct the description of dns_opt option of create_container
Signed-off-by: Boik <qazbnm456@gmail.com>
2017-06-22 12:23:38 -07:00
Joffrey F b9e5863e48 Merge pull request #1640 from zero57/add_attrs_for_pickling
Add attributes for pickling
2017-06-22 12:00:16 -07:00
Joffrey F 320c810471 Support credHelpers section in config.json
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-06-22 11:51:31 -07:00
Joffrey F 06d2553b9c Add support for ContainerSpec.TTY
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-06-21 16:29:25 -07:00
Joffrey F a3b1059839 Merge pull request #1658 from docker/1397-build-network
Add network_mode support to Client.build
2017-06-20 16:51:00 -07:00
Joffrey F a962578e51 Merge pull request #1659 from docker/moby33735
Make sure data is written in prune test so space can be reclaimed
2017-06-20 16:29:18 -07:00
Joffrey F 9b9fb0aa01 Make sure data is written in prune test so space can be reclaimed
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-06-20 16:07:15 -07:00