2086c20ce1
Merge pull request #1631 from madhuri-rai07/master
...
Add support for ``runtime`` config
2017-06-16 12:05:15 -07:00
87d5cd1b0a
Merge pull request #1632 from kaiyou/master
...
allow ipv6 :: notation in split_port (using re)
2017-06-16 11:57:52 -07:00
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
a9d4c7e2b6
Merge pull request #1653 from osallou/master
...
Closes #1588 , image.tag does not return anything
2017-06-16 11:32:25 -07:00
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
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
8fc6540fea
Merge pull request #1647 from docker/1642-dockerclient-secrets
...
DockerClient.secrets should be a @property
2017-06-15 18:18:25 -07:00
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
b0c30c8ac4
DockerClient.secrets should be a @property
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-06-14 12:20:47 -07:00
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
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
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
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
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
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
612c0f3d0d
Fix test cases for ``runtime`` config
...
Signed-off-by: Madhuri Kumari <madhuri.kumari@intel.com>
2017-06-07 10:47:27 +05:30
0c1271350d
Add a specific unit test for splitting port with IPv6
...
The test was copied from ccec87ca2c
2017-06-05 18:21:33 +02:00
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
6ae24b9e60
Add support for ``runtime`` in container create and run API
2017-06-01 15:09:46 +00:00
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
41aae65ab2
update swarm remove test status code from 500 to >= 400
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
2017-05-18 10:06:58 +08:00
bc69b1834e
Merge pull request #1619 from docker/AlexeyRokhin-master
...
fix type checking for nano_cpus
2017-05-17 16:56:39 -07:00
f6f5652eb2
fix type checking for nano_cpus
...
Signed-off-by: Alexey Rokhin <arokhin@mail.ru>
2017-05-17 16:06:23 -07:00
fb16d14544
Merge pull request #1615 from docker/service-placement
...
Add support for placement preferences and platforms in TaskTemplate
2017-05-17 15:25:40 -07:00
7af7e1b73a
Merge pull request #1612 from lawliet89/build-stage
...
Add `target` argument to image building
2017-05-17 15:01:33 -07:00
9cc021dfa6
Add support for placement preferences and platforms in TaskTemplate
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-05-17 13:48:30 -07:00
7880c5af1d
dev version
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-05-16 17:19:37 -07:00
0832898507
Merge pull request #1614 from docker/2.3.0-release
...
2.3.0 release
2017-05-16 17:12:41 -07:00
ba334f8bd5
Bump 2.3.0
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-05-16 14:53:41 -07:00
e4093ab258
Add `target` argument to image building
...
This is related to the multi-stage image building
that was introduced in 17.05 (API 1.29).
This allows a user to specify the stage of a multi-stage
Dockerfile to build for, rather than the final stage.
Signed-off-by: Yong Wen Chua <me@yongwen.xyz>
2017-05-16 16:13:54 +08:00
db542e71ee
Merge pull request #1606 from ymyzk/fix-docstring
...
Fix docstring of ImageCollection.get
2017-05-15 14:00:05 -07:00
2aa63dd9a6
Merge pull request #1605 from allencloud/update-test-status-code-from-500-to-400
...
update docker-py test status code from 500 to 400
2017-05-15 12:18:51 -07:00
6ea1ea8a51
Fix docstring of ImageCollection.get
...
Signed-off-by: Yusuke Miyazaki <miyazaki.dev@gmail.com>
2017-05-14 05:31:21 +09:00
717459db0e
update docker-py test status code from 500 to 400
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
2017-05-13 09:31:42 +08:00
cf68ebcdd8
Merge pull request #1604 from docker/1433-run-networks
...
Replace erroneous networks argument in containers.run
2017-05-12 15:29:04 -07:00
95297dc2e7
Replace erroneous networks argument in containers.run with singular
...
network equivalent.
Small docfixes
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-05-12 14:28:27 -07:00
007ab677a1
Merge pull request #1599 from docker/test_17.05_engine
...
Adjust tests and add newest engine version to Jenkinsfile
2017-05-09 18:01:20 -07:00
6ed0c01018
Adjust tests and add newest engine version to Jenkinsfile
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-05-09 17:18:46 -07:00
2bdaf7f857
Merge pull request #1598 from docker/init_path_removed
...
init_path removed in Engine 17.05
2017-05-09 17:01:47 -07:00
bf60e2a330
init_path removed in Engine 17.05
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-05-09 16:16:10 -07:00
4e217b5cc4
Merge pull request #1596 from docker/1585-pull-tag
...
Include tag in images.get after pulling if provided separately
2017-05-09 14:06:24 -07:00
c6ddea469f
Include tag in images.get after pulling if provided separately
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-05-09 12:24:40 -07:00
05741a160e
Merge branch 'Niboo-issue1567'
2017-05-08 14:14:36 -07:00
f27ecf3f88
Add ContainerSpec mounts test
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-05-08 14:13:59 -07:00
370cdb6dc5
Merge branch 'issue1567' of https://github.com/Niboo/docker-py into Niboo-issue1567
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-05-08 14:02:13 -07:00
933a303ede
Fix the way the list of mounts is made for service.
...
Signed-off-by: Antoine Verlant <antoine@niboo.be>
2017-05-08 10:09:36 +02:00
a453aeff5a
Merge branch 'aaronthebaron-1577-multi-success-message'
2017-05-05 15:11:24 -07:00
431f7c6432
Improve build result detection
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-05-05 15:08:38 -07:00
e19aad860c
Merge branch '1577-multi-success-message' of https://github.com/aaronthebaron/docker-py into aaronthebaron-1577-multi-success-message
2017-05-05 15:01:16 -07:00
36b2d8149b
Merge pull request #1590 from alfred-landrum/denied-error
...
Update image create error parsing
2017-05-05 11:36:52 -07:00
Joffrey F
Olivier Sallou
Chris Mark
Joffrey F
Matt Oberle
Bryan Boreham
grahamlyons
Madhuri Kumari
kaiyou
allencloud
Alexey Rokhin
Yong Wen Chua
Yusuke Miyazaki
Antoine Verlant