summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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 #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>
| * added integration test for #1625 for ImageCollection.build() that verfies ↵Chris Ottinger2017-05-271-0/+11
| | | | | | | | | | | | that the build method uses the last success message for extracting the image id Signed-off-by: Chris Ottinger <chris.ottinger@team.telstra.com>
| * fix #1625 where ImageCollection.build() could return early with incorrect ↵Chris Ottinger2017-05-271-3/+4
| | | | | | | | image_id depending on docer build output Signed-off-by: Chris Ottinger <chris.ottinger@team.telstra.com>
* | Merge pull request #1620 from docker/healthcheck-start-periodJoffrey F2017-06-195-9/+47
|\ \ | | | | | | Add support for start_period in Healthcheck spec
| * | Add support for start_period in Healthcheck spechealthcheck-start-periodJoffrey F2017-06-165-9/+47
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | Merge pull request #1649 from shin-/1639-exec-id-check-resourceJoffrey F2017-06-1911-65/+66
|\ \ \ | |/ / |/| | Update check_resource decorator to account for new resource names
| * | Update check_resource decorator to account for new resource namesJoffrey F2017-06-1511-65/+66
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | Merge pull request #1617 from docker/create-ingress-networkJoffrey F2017-06-163-1/+22
|\ \ \ | | | | | | | | Add support for ingress in create_network
| * | | Add support for ingress in create_networkcreate-ingress-networkJoffrey F2017-05-173-1/+22
| | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | Merge pull request #1629 from shin-/1610-docfixJoffrey F2017-06-161-3/+0
|\ \ \ \ | | | | | | | | | | Fix misleading build method docs
| * | | | Fix misleading build method docsJoffrey F2017-05-301-3/+0
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | Merge pull request #1631 from madhuri-rai07/masterJoffrey F2017-06-164-5/+24
|\ \ \ \ | | | | | | | | | | Add support for ``runtime`` config
| * | | | Fix test cases for ``runtime`` configMadhuri Kumari2017-06-075-8/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Madhuri Kumari <madhuri.kumari@intel.com>
| * | | | Add support for ``runtime`` in container create and run APIMadhuri Kumari2017-06-015-5/+24
| |/ / /
* | | | Merge pull request #1632 from kaiyou/masterJoffrey F2017-06-162-67/+46
|\ \ \ \ | | | | | | | | | | allow ipv6 :: notation in split_port (using re)
| * | | | Add a specific unit test for splitting port with IPv6kaiyou2017-06-051-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test was copied from https://github.com/greybyte/docker-py/commit/ccec87ca2c2aacfcfe3b38c5bc7d59dd73551c51 Signed-off-by: kaiyou <pierre@jaury.eu>
| * | | | Rewrite the split_port function using rekaiyou2017-06-051-67/+40
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | Merge pull request #1648 from ChrsMark/masterJoffrey F2017-06-162-0/+12
|\ \ \ \ | | | | | | | | | | Raising error in case of invalid value of since kwarg on Container.logs
| * | | | Raising error in case of invalid value of since kwarg on Container.logsChris Mark2017-06-162-0/+12
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Chris Mark <chrismarkou92@gmail.com>
* | | | Merge pull request #1653 from osallou/masterJoffrey F2017-06-162-2/+3
|\ \ \ \ | |/ / / |/| | | Closes #1588, image.tag does not return anything
| * | | Closes #1588, image.tag does not return anythingOlivier Sallou2017-06-162-2/+3
|/ / / | | | | | | | | | | | | | | | 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>
* | | Merge pull request #1647 from docker/1642-dockerclient-secretsJoffrey F2017-06-151-0/+1
|\ \ \ | | | | | | | | DockerClient.secrets should be a @property
| * | | DockerClient.secrets should be a @property1642-dockerclient-secretsJoffrey F2017-06-141-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | Merge pull request #1634 from grahamlyons/readtimeout_calling_container_stopJoffrey F2017-06-142-1/+15
|\ \ \ \ | |/ / / |/| | | Ensure default timeout is used by API Client
| * | | Move default `timeout` into `from_env`grahamlyons2017-06-092-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | Ensure default timeout is used by API Clientgrahamlyons2017-06-082-3/+19
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge pull request #1646 from mattoberle/patch-1Joffrey F2017-06-141-1/+1
|\ \ \ | | | | | | | | excludes requests 2.18.0 from compatible versions
| * | | excludes requests 2.18.0 from compatible versionsMatt Oberle2017-06-141-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge pull request #1644 from bboreham/test-pull-latestJoffrey F2017-06-141-3/+4
|\ \ \ | |/ / |/| | Only pull the 'latest' tag when testing images
| * | Only pull the 'latest' tag when testing imagesBryan Boreham2017-06-141-3/+4
|/ / | | | | | | Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
* | Merge pull request #1621 from ↵Joffrey F2017-05-221-1/+1
|\ \ | | | | | | | | | | | | allencloud/update-swarm-remove-test-status-code-from-500-to-400 update node remove test status code from 500 to >= 400
| * | update swarm remove test status code from 500 to >= 400allencloud2017-05-181-1/+1
|/ / | | | | | | Signed-off-by: allencloud <allen.sun@daocloud.io>
* | Merge pull request #1619 from docker/AlexeyRokhin-masterJoffrey F2017-05-171-1/+1
|\ \ | | | | | | fix type checking for nano_cpus
| * | fix type checking for nano_cpusAlexeyRokhin-masterAlexey Rokhin2017-05-171-1/+1
| |/ | | | | | | Signed-off-by: Alexey Rokhin <arokhin@mail.ru>
* | Merge pull request #1615 from docker/service-placementJoffrey F2017-05-174-32/+115
|\ \ | |/ |/| Add support for placement preferences and platforms in TaskTemplate
| * Add support for placement preferences and platforms in TaskTemplateservice-placementJoffrey F2017-05-174-32/+115
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #1612 from lawliet89/build-stageJoffrey F2017-05-173-1/+35
|\ \ | |/ |/| Add `target` argument to image building
| * Add `target` argument to image buildingYong Wen Chua2017-05-163-1/+35
| | | | | | | | | | | | | | | | | | | | 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>
* | dev versionJoffrey F2017-05-161-1/+1
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #1614 from docker/2.3.0-release2.3.0Joffrey F2017-05-162-1/+42
|\ \ | |/ |/| 2.3.0 release
| * Bump 2.3.02.3.0-releaseJoffrey F2017-05-162-1/+42
|/ | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #1606 from ymyzk/fix-docstringJoffrey F2017-05-151-2/+2
|\ | | | | Fix docstring of ImageCollection.get
| * Fix docstring of ImageCollection.getYusuke Miyazaki2017-05-141-2/+2
| | | | | | | | Signed-off-by: Yusuke Miyazaki <miyazaki.dev@gmail.com>
* | Merge pull request #1605 from allencloud/update-test-status-code-from-500-to-400Joffrey F2017-05-151-1/+1
|\ \ | |/ |/| update docker-py test status code from 500 to 400
| * update docker-py test status code from 500 to 400allencloud2017-05-131-1/+1
| | | | | | | | Signed-off-by: allencloud <allen.sun@daocloud.io>
* | Merge pull request #1604 from docker/1433-run-networksJoffrey F2017-05-125-13/+40
|\ \ | |/ |/| Replace erroneous networks argument in containers.run
| * Replace erroneous networks argument in containers.run with singular1433-run-networksJoffrey F2017-05-125-13/+40
|/ | | | | | | | network equivalent. Small docfixes Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #1599 from docker/test_17.05_engineJoffrey F2017-05-094-17/+37
|\ | | | | Adjust tests and add newest engine version to Jenkinsfile
View Lorry Controller Status