008730c670
Merge pull request #1248 from docker/setup-py-fixes
...
Add missing long_description and maintainer fields to setup.py
2016-10-05 16:45:50 -07:00
f4cb91eb02
Add missing long_description and maintainer fields to setup.py
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-10-05 15:27:36 -07:00
9957af9d57
Merge pull request #1243 from mattjegan/master
...
Fix syntax in README required by RST
2016-10-05 11:27:34 -07:00
dc8cf2b8e7
Merge pull request #1226 from TomasTomecek/remove-ipaddress-dep
...
document ipaddress dependency
2016-10-05 11:26:54 -07:00
531fdc77e8
Merge branch 'api-docs-update'
2016-10-05 11:21:31 -07:00
b22e390e56
Merge branch 'TomasTomecek-improve-version-mismatcj'
2016-10-05 11:19:23 -07:00
f52203601b
Merge branch 'TomasTomecek-improve-version-mismatcj'
2016-10-05 11:15:29 -07:00
230d8c7efe
Removed non-existent FAQ page from mkdocs.yml
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-10-05 11:15:09 -07:00
790d7525f0
document how to recover from api version mismatch
...
Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
2016-10-05 09:33:32 +02:00
aa2bd80ebb
document requirement for ipaddress module
...
Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
2016-10-05 09:32:33 +02:00
b65de73afe
Update adapters to use pool_connections instead of num_pools
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-10-04 12:19:33 -07:00
8239032463
fix for got an unexpected keyword argument 'num_pools'
...
requests's HTTPAdapter API is pool_connections for number of connection of the pool
Signed-off-by: Pierre Tardy <tardyp@gmail.com>
2016-10-04 13:13:31 +02:00
daec55d4e1
Fix syntax in README required by RST
...
Before the readme is converted to rst it required an extra character to convert with no errors. Signed-off-by: Matthew Egan <matthewj.egan@hotmail.com>
2016-10-04 13:38:01 +11:00
89a1ffa77b
Merge pull request #1217 from bfirsh/reorganisation-base-tests
...
Move BaseTestCase to BaseIntegrationTest
2016-10-03 11:36:02 -07:00
69e992ec48
Move requires_api_version to helpers
...
Because it's a helper, not a base thing. In preparation for
moving/deleting the unit test base classes.
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-10-03 11:58:08 +01:00
7339d77043
Move BaseTestCase to BaseIntegrationTest
...
Because two things called `BaseTestCase` is quite confusing.
I haven't bothered refactoring the other `BaseTestCase` because
that disappears anyway when we drop Python 2.6 support.
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-10-03 11:58:08 +01:00
8cb186b623
Add timeout to from_env
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-10-03 11:58:08 +01:00
2b34e0b8e4
Merge pull request #1224 from mferon/addRestartPolicyUpdateSupport
...
Add support for restart policy update
2016-09-29 14:53:53 -07:00
ce52e091e1
Merge pull request #1232 from pacoxu/typo_paco
...
replace on_failure with on-failure
2016-09-29 11:36:42 -07:00
81945c0901
Merge pull request #1234 from aboch/ip
...
Adjust test_create_network_with_ipam_config
2016-09-29 11:25:12 -07:00
a864059b83
Adjust test_create_network_with_ipam_config
...
- to account for API change: IPAM class will now
also include a Data class, besides Config.
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-09-29 09:49:58 -07:00
65ad1545e8
replace on_failure with on-failure
...
Signed-off-by: 徐俊杰<roollingstone@gmail.com>
Signed-off-by: XuPaco <roollingstone@gmail.com>
2016-09-29 11:01:51 +08:00
a665c8c443
Add support for restart policy update
...
Signed-off-by: Maxime Feron <maxime.feron@corp.ovh.com>
2016-09-28 10:21:59 +02:00
52c2cc8453
Merge pull request #1228 from christianbundy/synthesize-execute-bit
...
Synthesize execute permission bit
2016-09-27 15:47:22 -07:00
a718ab690e
Pass file object to Tarfile.addfile()
...
This resolves an issue where TarFile.gettarinfo() doesn't include the
file object, meaning that TarFile.addfile(TarFile.gettarinfo()) doesn't
pass the test suite. Instead, this uses an open() within a try...except
block to include a file object for each file without passing a file
object when the path is a directory.
Signed-off-by: Christian Bundy <christianbundy@fraction.io>
2016-09-27 21:39:30 +00:00
cbd2ba52af
Synthesize executable bit on Windows
...
The build context is tarred up on the client and then sent to the Docker
daemon. However Windows permissions don't match the Unix ones.
Therefore we have to mark all files as executable when creating a build
context on Windows, like `docker build` already does:
https://github.com/docker/docker/issues/11047 .
Signed-off-by: Sebastian Schwarz <seschwar@gmail.com>
2016-09-27 00:11:31 +00:00
803ff5030e
Merge branch 'release'
2016-09-19 18:00:27 -07:00
fc481c4cd1
Merge pull request #1220 from docker/1.10.3-release
...
1.10.3 release
2016-09-16 12:09:14 -07:00
64fba723dd
Number of pools in adapter is configurable
...
Default increased from 10 to 25
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-09-16 11:55:08 -07:00
06b6a62faa
Add support for identity tokens in config file.
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-09-16 11:54:50 -07:00
e4cf97bc7b
Bump version
...
Update Changelog
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-09-16 11:54:06 -07:00
1e939be5fb
Merge pull request #1210 from docker/identity-token-support
...
Add support for identity tokens in config file
2016-09-16 11:47:48 -07:00
d731a4315c
Add support for identity tokens in config file.
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-09-15 14:28:09 -07:00
9141e9496d
Merge pull request #1215 from bfirsh/autopep8
...
Fix a few pep8 issues
2016-09-14 14:08:13 -07:00
48b7835a92
Merge pull request #1216 from bfirsh/makefile-improvements
...
Makefile improvements
2016-09-14 14:06:52 -07:00
230bc18bfd
Merge pull request #1208 from docker/1207-configurable-num-pools
...
Number of pools in adapter is configurable
2016-09-14 11:10:25 -07:00
89afee94fd
Merge pull request #1213 from bfirsh/parse-json-errors
...
Parse JSON API errors
2016-09-14 11:09:55 -07:00
ad350b95b1
Merge pull request #1214 from bfirsh/ignore-not-in-swarm-error-when-leaving
...
Ignore not in swarm error when force leaving
2016-09-14 11:08:49 -07:00
71b0b7761a
Add make shell to open a Python shell
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-09-14 17:15:10 +01:00
1a57f8800e
Add file arg to integration tests
...
make integration-test file=models_services_test.py
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-09-14 17:14:58 +01:00
6220636536
Fix a few pep8 issues
...
autopep8 --in-place --recursive --experimental -aaa --ignore E309 .
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-09-14 16:54:54 +01:00
ca51ad29a5
Ignore not in swarm error when force leaving
...
Real errors were getting swallowed in these tests, producing
other confusing cascading errors. This makes it much easier to
make sure a node is not in a Swarm, while also handling other
errors correctly.
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-09-14 16:00:03 +01:00
dcd01f0f48
Parse JSON API errors
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-09-14 14:54:40 +01:00
be7d0f0184
Number of pools in adapter is configurable
...
Default increased from 10 to 25
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-09-12 17:43:50 -07:00
e833881577
Merge pull request #1202 from docker/1.10.2-release
...
1.10.2 release
2016-09-11 19:11:18 -07:00
2ad403c78b
Bump docker-pycreds dependency ; bump patch number
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-09-11 19:01:39 -07:00
c2b4c8e2e2
Merge pull request #1198 from docker/1.10.1-release
...
1.10.1 release
2016-09-09 17:08:26 -07:00
8abb8eecfc
Re-add docker.utils.types module for backwards compatibility
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-09-09 16:56:19 -07:00
e676840945
Merge pull request #1197 from docker/1196-docker.utils.types
...
Re-add docker.utils.types module for backwards compatibility
2016-09-09 16:55:49 -07:00
7167189486
Bump version + Update Changelog
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-09-09 16:55:10 -07:00
Joffrey F
Joffrey F
Tomas Tomecek
Pierre Tardy
mattjegan
Ben Firshman
Alessandro Boch
徐俊杰
Maxime Feron
Christian Bundy
Sebastian Schwarz