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
6ef14932d0
enable setting of node labels #1225
...
Added update_node function to enable setting labels on nodes. This
exposes the Update a Node function from the Docker API and should
enable promoting/demoting manager nodes inside a swarm.
Signed-off-by: Nathan Shirlberg <nshirlberg@labattfood.com>
2016-09-27 11:26:26 -05: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
a6fb7a2064
Re-add docker.utils.types module for backwards compatibility
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-09-09 16:50:03 -07:00
72e7afe17a
dev version
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-09-09 16:43:54 -07:00
e045331e32
Merge pull request #1190 from docker/1.10.0-release
...
1.10.0 release
2016-09-09 14:08:18 -07:00
3eb93f6662
Bump version
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-09-08 12:00:25 -07:00
15ac73a22d
Merge pull request #1087 from docker/1076-dns-fix
...
Remove default adapters when connecting through a unix socket.
2016-09-08 11:59:37 -07:00
e6601e2e55
Remove default adapters when connecting through a unix socket.
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-09-08 11:20:48 -07:00
df50df38f9
Merge pull request #1191 from bfirsh/fix-makefile-phony
...
Add .PHONY for each makefile instruction
2016-09-08 10:12:13 -07:00
0648923596
Add .PHONY for each makefile instruction
...
Makes it much easier to keep this maintained properly. See also:
http://clarkgrubb.com/makefile-style-guide#phony-targets
Replaces #1164
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-09-08 15:42:44 +01:00
717ec945db
Merge pull request #1189 from docker/1188-npipesocket-makefile
...
Handle bufsize < 0 in makefile() as a substitute for default
2016-09-07 18:06:24 -07:00
0430d00f2f
Handle bufsize < 0 in makefile() as a substitute for default
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-09-07 17:49:07 -07:00
a44d65be37
Merge pull request #1187 from bfirsh/fix-broken-mac-address-unit-test
...
Fix unit test which doesn't do anything
2016-09-07 11:29:48 -07:00
0cdf737625
Fix unit test which doesn't do anything
...
It also overrode the fake API inspect endpoint with a broken
response.
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-09-07 11:40:19 +02:00
08da5bfdfc
Merge pull request #1092 from docker/1064-import-changes
...
Add support for changes in import_image*
2016-09-06 16:00:00 -07:00
75497e0752
Add test for import_image with changes param
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-09-06 15:38:44 -07:00
65fb5be4cd
Add support for changes param in import_image* methods
...
Reduce code duplication in import_image* methods
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-09-06 15:38:44 -07:00
fab4a06c8a
Merge pull request #1181 from docker/credstore-support
...
Add credentials store support
2016-09-06 15:37:57 -07:00
219a8699f9
Better credentials store error handling in resolve_authconfig
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-09-06 15:17:36 -07:00
fbe1686e62
Add credentials store support
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-09-06 15:17:36 -07:00
545c5ac3cc
Merge pull request #1184 from bfirsh/fix-licenses
...
Fix licenses
2016-09-06 10:30:33 -07:00
d9e868ab74
Merge pull request #1185 from bfirsh/make-docs
...
Add make docs command for building docs
2016-09-06 10:27:35 -07:00
291470146f
Add make docs command for building docs
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-09-05 19:23:04 +02:00
3769c089e8
Fix licenses
...
* Complete main LICENSE
* Remove unnecessary licenses from individual files
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-09-05 17:48:09 +02:00
Joffrey F