Commit Graph

2043 Commits

Author SHA1 Message Date
Ben Firshman 04e9437986
Update setup.py details
Move from "docker-py" package to "docker".

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-28 15:11:01 +00:00
Ben Firshman e04c4ad83f
Update readme to say "Docker Engine API"
It's not the Docker API.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-28 15:10:58 +00:00
Aanand Prasad 4c8c761bc1 Merge pull request #1307 from docker/bfirsh_maintainer
Add Ben to MAINTAINERS
2016-11-28 14:45:34 +00:00
Ben Firshman a658e14e8b
Specify encoding when loading readme
Loading readme fails when system locale is not utf-8.

Potentially replaces #1313

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-28 14:38:38 +00:00
Brandon Bodnar 9fc8b3a730 Add unit tests for should_check_directory.
Signed-off-by: Brandon Bodnar <bodnarbm@gmail.com>
2016-11-26 21:36:54 -05:00
Brandon Bodnar e2eb4a3158 Prevent traversing excluded directories with no possible dockerignore exceptions
Fixes an issue where all files in a rather large excluded folder are traversed and examined when creating the build context for potential exception to the exclusion, even though the exclusion rule is for a completely unrelated folder.

Signed-off-by: Brandon Bodnar <bodnarbm@gmail.com>
2016-11-26 21:17:18 -05:00
Ben Firshman b4c02393b2
Remove MAINTAINER from Dockerfiles
It was deprecated in https://github.com/docker/docker/pull/25466

(Sorry @shin- ;)

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-24 13:32:20 +00:00
Joffrey F 037ead974b Add Ben to MAINTAINERS
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-11-23 11:37:33 -08:00
Joffrey F c66c7f8b0a Merge pull request #1306 from bfirsh/mmmmmm-vector-graphics
Use SVG for build status badge
2016-11-23 11:30:20 -08:00
Joffrey F 30f3a0299e Merge pull request #1304 from bfirsh/fix-documentation-link
Fix documentation link in readme
2016-11-23 11:28:52 -08:00
Ben Firshman af67add683
Add warning about development version to readme
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-23 18:07:33 +00:00
Ben Firshman aafcf5a7fe
Change package in readme back to docker-py
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-23 18:02:23 +00:00
Ben Firshman afea2ca269
Use SVG for build status badge
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-23 15:21:56 +00:00
Ben Firshman c96848eb9c
Fix documentation link in readme
The rest of the readme is wrong until we release 2.0, but at
least the documentation points to the right place.

Closes #1302

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-23 14:47:46 +00:00
Joffrey F 8478491cf8 Merge pull request #1186 from bfirsh/two-point-oh
A new user-focused API
2016-11-22 16:41:52 -08:00
Joffrey F 0591477642 Merge pull request #1301 from biniambekele/master
Fix ContainerApiMixin.copy with dict container arg
2016-11-22 16:29:51 -08:00
biniambekele a38644fc0e Fix ContainerApiMixin.copy with dict container arg
Signed-off-by: biniambekele <biniambekele@users.noreply.github.com>
2016-11-22 15:17:45 -05:00
Ben Firshman b5f7d380d0
Add helpful error for APIClient methods on Client
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-22 17:05:43 +00:00
Ben Firshman c7a3aa7e44
Add new Sphinx documentation
Initial work thanks to @aanand.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-22 17:05:43 +00:00
Ben Firshman 1984f68730
Add new user-focused API
See #1086

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-22 17:05:43 +00:00
Ben Firshman f32c0c1709
Add docstrings to low-level API
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-22 17:03:04 +00:00
Ben Firshman ed959f2144
Move contributing docs to CONTRIBUTING.md
CONTRIBUTING.md is the place that GitHub expects it to be.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-22 17:03:04 +00:00
Ben Firshman d98a879016
Add random_name test helper
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-22 17:03:04 +00:00
Ben Firshman 6334312e47
Split out base integration test for APIClient
So the cleanup stuff can be reused for model tests.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-22 17:03:04 +00:00
Ben Firshman 39900c558c
Move APIClient tests into single file
For some reason this was spread across two files.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-22 17:03:04 +00:00
Ben Firshman e055a1c813
Rename DockerClientTest to BaseAPIClientTest
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-22 17:03:04 +00:00
Ben Firshman dac7174ff2
Make ping return bool instead of string
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-22 17:03:03 +00:00
Ben Firshman 9daa320454
Rename Client to APIClient
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-22 17:03:03 +00:00
Ben Firshman c7903f084e
Remove AutoVersionClient
Just do Client(version='auto').

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-22 17:03:03 +00:00
Ben Firshman d5bc7dc99a
Drop support for Python 2.6
Because it's ancient. If you're still using it, you can use an old
version of docker-py.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-22 17:03:03 +00:00
Ben Firshman b49cacced0
Make docker.utils.ports a single file
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-22 17:03:03 +00:00
Ben Firshman 19eefcf705
Make docker.ssladaptor a single file
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-22 17:03:03 +00:00
Ben Firshman 2c9d1110f0
Make docker.auth a single file
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-22 17:03:03 +00:00
Ben Firshman 81dfc475b3
Drop support for API versions <1.24
Implemented as just a warning. Actual removal of code will follow
sometime in the future.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-22 17:03:01 +00:00
Joffrey F 7c7688cba9 Merge pull request #1266 from bfirsh/add-rm-to-makefile-docker-run
Add --rm to docker run in Makefile
2016-11-21 11:30:02 -08:00
Ben Firshman 087a049b06
Add --rm to docker run in Makefile
So tests don't leave containers all over the place. The downside
is this makes it a bit harder to debug a test's filesystem -
you'll have to remove the "--rm" and run the test again.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-21 14:07:39 +00:00
Joffrey F f12b618ee9 Merge pull request #1236 from docker/host_config_isolation
Add support for isolation param in host config
2016-11-17 17:42:57 -08:00
Aanand Prasad 2ff7371ae7 Merge pull request #1294 from aanand/add-healthcheck
Add support for passing healthcheck to create_container
2016-11-16 16:12:05 +00:00
Aanand Prasad e4b6d0dca6 Convert dicts to Healthcheck objects, string commands to CMD-SHELL lists
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-11-16 16:04:17 +00:00
Aanand Prasad 6bb7844ab3 Rework healthcheck integration test
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-11-16 16:04:17 +00:00
Jamie Greeff b4f2b5fa70 Add support for passing healthcheck to create_container
Signed-off-by: Jamie Greeff <jamie@greeff.me>
2016-11-16 16:04:17 +00:00
Joffrey F f262dd6da9 Merge pull request #1281 from TomasTomecek/1265-ssl-test-no-sslX-support-in-openssl
ssl,test: OpenSSL may not support ssl2
2016-11-14 12:02:55 -08:00
Joffrey F 558ec261e4 Merge pull request #1296 from aanand/fix-flake8
Fix linting error
2016-11-14 11:58:11 -08:00
Aanand Prasad c66c2d6fa5 Fix linting error
This seems to have been ignored by older versions of flake8, and fixed
in version 3.1.0 or 3.1.1.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-11-14 18:20:13 +00:00
Tomas Tomecek 9a485b30ee ssl,test: OpenSSL may not support ssl2
Fixes #1265

Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
2016-11-14 09:05:26 +01:00
Joffrey F 2ca68f3d08 Merge pull request #1292 from liubin/master
Fix DriverConfig JSON key
2016-11-11 12:38:04 -08:00
Simon Li cb967ef682 Add test for creating service with env
Signed-off-by: Simon Li <orpheus+devel@gmail.com>
2016-11-11 16:29:43 +00:00
Simon Li 6fad0855b5 Use format_environment to convert env in ContainerSpec
Signed-off-by: Simon Li <orpheus+devel@gmail.com>
2016-11-11 16:11:18 +00:00
bin liu d6ffe9aa0d fix JSON key typo, it should not be underscores, but should be camelCase with first letter capital
Signed-off-by: bin liu <liubin0329@gmail.com>
2016-11-11 20:19:43 +08:00
Joffrey F e1518bf2a7 Merge pull request #1263 from rmb938/labelshm
Add labels and shmsize arguments to the image build
2016-11-09 10:54:59 -08:00