Commit Graph

2178 Commits

Author SHA1 Message Date
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 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 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 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
An Ha 0165a343d5 Add attributes for pickling
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>
2017-06-20 09:39:17 -04:00
Joffrey F 39bb78ac69 Add network_mode support to Client.build
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-06-19 15:50:28 -07:00
Joffrey F bb82bcf784 Merge pull request #1626 from datwiz/images-build-error-1625
fix #1625 where ImageCollection.build() could return with incorrect image id
2017-06-19 15:20:17 -07:00
Joffrey F ce8a6ea442 Merge pull request #1620 from docker/healthcheck-start-period
Add support for start_period in Healthcheck spec
2017-06-19 15:12:26 -07:00
Joffrey F 75e850e531 Merge pull request #1649 from shin-/1639-exec-id-check-resource
Update check_resource decorator to account for new resource names
2017-06-19 14:56:23 -07:00
Joffrey F 1ea6618b09 Add support for start_period in Healthcheck spec
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-06-16 17:02:59 -07:00
Joffrey F 8645d1d41b Merge pull request #1617 from docker/create-ingress-network
Add support for ingress in create_network
2017-06-16 12:06:56 -07:00
Joffrey F 0ac926b112 Merge pull request #1629 from shin-/1610-docfix
Fix misleading build method docs
2017-06-16 12:05:50 -07:00
Joffrey F 2086c20ce1 Merge pull request #1631 from madhuri-rai07/master
Add support for ``runtime`` config
2017-06-16 12:05:15 -07:00
Joffrey F 87d5cd1b0a Merge pull request #1632 from kaiyou/master
allow ipv6 :: notation in split_port (using re)
2017-06-16 11:57:52 -07:00
Joffrey F e50eacd9ea Merge pull request #1648 from ChrsMark/master
Raising error in case of invalid value of since kwarg on Container.logs
2017-06-16 11:49:30 -07:00
Joffrey F a9d4c7e2b6 Merge pull request #1653 from osallou/master
Closes #1588, image.tag does not return anything
2017-06-16 11:32:25 -07:00
Olivier Sallou d638829f73 Closes #1588, image.tag does not return anything
This patch returns the check made against api when tagging an image as stated in documentation

Signed-off-by: Olivier Sallou <olivier.sallou@irisa.fr>
2017-06-16 17:49:43 +02:00
Chris Mark c03a009e2d
Raising error in case of invalid value of since kwarg on Container.logs
Signed-off-by: Chris Mark <chrismarkou92@gmail.com>
2017-06-16 18:30:24 +03:00
Joffrey F d33e9ad030 Update check_resource decorator to account for new resource names
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-06-15 18:34:00 -07:00
Joffrey F 8fc6540fea Merge pull request #1647 from docker/1642-dockerclient-secrets
DockerClient.secrets should be a @property
2017-06-15 18:18:25 -07:00
Joffrey F 1eef700eb7 Merge pull request #1634 from grahamlyons/readtimeout_calling_container_stop
Ensure default timeout is used by API Client
2017-06-14 15:18:10 -07:00
Joffrey F b0c30c8ac4 DockerClient.secrets should be a @property
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-06-14 12:20:47 -07:00
Joffrey F be0a15a89c Merge pull request #1646 from mattoberle/patch-1
excludes requests 2.18.0 from compatible versions
2017-06-14 12:13:03 -07:00
Joffrey F d643a3b997 Merge pull request #1644 from bboreham/test-pull-latest
Only pull the 'latest' tag when testing images
2017-06-14 12:12:54 -07:00
Matt Oberle ae1f596d37 excludes requests 2.18.0 from compatible versions
The 2.18.0 version of requests breaks compatibility with docker-py:
https://github.com/requests/requests/issues/4160

[This block](https://github.com/shazow/urllib3/blob/master/urllib3/connectionpool.py#L292) of code from urllib3 fails:
```python
    def _get_timeout(self, timeout):
        """ Helper that always returns a :class:`urllib3.util.Timeout` """
        if timeout is _Default:
            return self.timeout.clone()

        if isinstance(timeout, Timeout):
            return timeout.clone()
        else:
            # User passed us an int/float. This is for backwards compatibility,
            # can be removed later
            return Timeout.from_float(timeout)
```

In the case of requests version 2.18.0:
`timeout` was an instance of `urllib3.util.timeout.Timeout`
`Timeout` was an instance of `requests.packages.urllib3.util.timeout.Timeout`

When the `isinstance(timeout, Timeout)` check fails the `urllib3.util.timeout.Timeout` object is passed as the `connection` argument to `requests.packages.urllib3.util.timeout.Timeout.from_float`.

Signed-off-by: Matt Oberle <matt.r.oberle@gmail.com>
2017-06-14 14:44:56 -04:00
Bryan Boreham 234296171f Only pull the 'latest' tag when testing images
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2017-06-14 14:05:26 +00:00
grahamlyons ff993dd858 Move default `timeout` into `from_env`
We'd like to be able to pass `None` as a value for `timeout` because
it has meaning to the `requests` library
(http://docs.python-requests.org/en/master/user/advanced/#timeouts)

Signed-off-by: grahamlyons <graham@grahamlyons.com>
2017-06-09 09:52:49 +01:00
grahamlyons ee75a1c2e3 Ensure default timeout is used by API Client
The `from_env` method on the `docker` module passed `None` as the
value for the `timeout` keyword argument which overrode the default
value in the initialiser, taken from `constants` module.

This sets the default in the initialiser to `None` and adds logic
to set that, in the same way that `version` is handled.

Signed-off-by: grahamlyons <graham@grahamlyons.com>
2017-06-08 14:39:17 +01:00
Madhuri Kumari 612c0f3d0d Fix test cases for ``runtime`` config
Signed-off-by: Madhuri Kumari <madhuri.kumari@intel.com>
2017-06-07 10:47:27 +05:30
kaiyou 0c1271350d Add a specific unit test for splitting port with IPv6
The test was copied from ccec87ca2c

Signed-off-by: kaiyou <pierre@jaury.eu>
2017-06-05 18:21:33 +02:00
kaiyou 5dd91cd4aa Rewrite the split_port function using re
In the case of a defined format with specific parts, a regular
expression with named capturing bits make reasoning about the
parts simpler than imlementing a parser from scratch.

Signed-off-by: kaiyou <pierre@jaury.eu>
2017-06-05 18:21:21 +02:00
Madhuri Kumari 6ae24b9e60 Add support for ``runtime`` in container create and run API 2017-06-01 15:09:46 +00:00
Joffrey F 9eecfb0d2f Fix misleading build method docs
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-05-30 11:45:00 -07:00
Chris Ottinger 1223fc144f new integration task linting for #1625
Signed-off-by: Chris Ottinger <chris.ottinger@team.telstra.com>
2017-05-27 11:24:58 +10:00
Chris Ottinger 6ef9d426eb added integration test for #1625 for ImageCollection.build() that verfies that the build method uses the last success message for extracting the image id
Signed-off-by: Chris Ottinger <chris.ottinger@team.telstra.com>
2017-05-27 10:29:36 +10:00
Chris Ottinger 45aec93089 fix #1625 where ImageCollection.build() could return early with incorrect image_id depending on docer build output Signed-off-by: Chris Ottinger <chris.ottinger@team.telstra.com> 2017-05-27 00:21:19 +10:00
Joffrey F dc2b24dcdd Merge pull request #1621 from allencloud/update-swarm-remove-test-status-code-from-500-to-400
update node remove test status code from 500 to >= 400
2017-05-22 12:09:07 -07:00