Commit Graph

2876 Commits

Author SHA1 Message Date
shin- 7e415dd234 Fixing failed merge 2013-07-15 19:04:24 +02:00
shin- 4488be3678 Fixed tests 2013-07-15 19:02:48 +02:00
shin- 43b3b0996f Replaced build with build_context ; added support for in-memory dockerfiles 2013-07-15 18:57:09 +02:00
shin- 4a3350b398 Switching to server-side build system 2013-07-15 18:57:09 +02:00
Joffrey F 3d05cda956 Merge pull request #19 from robbyt/patch-1
pip needs "=="
2013-07-15 06:31:37 -07:00
Rob Terhaar d3edaa7a14 pip needs "==" 2013-07-13 19:42:13 -04:00
Ken Cochrane 17c328afa5 Merge pull request #18 from mneilsen/master
Minor fixes: requirements.txt, setuptools test support
2013-07-13 05:00:38 -07:00
Mike Neilsen b981f9a6de Create tests module for setuptools test support
Run test suite via

  python setup.py test

Signed-off-by: Mike Neilsen <mneilsen@acm.org>
2013-07-13 01:07:04 -05:00
Mike Neilsen 5bf0625a7a Add six==1.3.0 to requirements.txt
Signed-off-by: Mike Neilsen <mneilsen@acm.org>
2013-07-13 01:04:39 -05:00
Joffrey F 2ece148452 Fixed: missing linebreak 2013-07-12 15:47:37 +02:00
Joffrey F eb62af9dab Merge pull request #16 from globocom/bind-mounts
Add support for bind mounts
2013-07-12 06:45:17 -07:00
Enrico cf47df1b3e Removed duplicated import. 2013-07-11 18:05:19 -03:00
Enrico be5347533d Fixed whitespaces on readme and removed makefile references. 2013-07-11 17:54:36 -03:00
Enrico 3438bd914b Revert "Added Makefile with test command."
This reverts commit 8bab36469d.

Conflicts:
	Makefile
2013-07-11 17:54:36 -03:00
Enrico a863acce87 Added ability to create binds when starting a container. 2013-07-11 17:54:36 -03:00
Thatcher be9c964730 Fixed bug by which c.port('<id>', <port>) would fail because when port not a string
e.g. 
c.port('e087bc23f8d5', 80)

would fail

and 
c.port('e087bc23f8d5', '80') would work. I now inserted str() so it should always work.
2013-07-11 17:53:14 -03:00
Joffrey F 8633e5547f Merge pull request #17 from dhrp/master
Fixed bug by which c.port('<id>', <port>) would fail
2013-07-11 12:33:42 -07:00
Paulo Sousa e1c8a57c85 Added option to attach on containers and be verbose on build process 2013-07-11 16:03:45 -03:00
Thatcher 2095fee005 Fixed bug by which c.port('<id>', <port>) would fail because when port not a string
e.g. 
c.port('e087bc23f8d5', 80)

would fail

and 
c.port('e087bc23f8d5', '80') would work. I now inserted str() so it should always work.
2013-07-05 18:20:38 -07:00
Enrico 2551105320 Merge branch 'upstream-master' into bind-mounts
Conflicts:
	tests/test.py
2013-07-05 16:23:37 -03:00
Enrico 76d2aa06da Added documentation about the `binds` argument in the `start` method. 2013-07-05 15:53:53 -03:00
Enrico 835f350bd7 Added content-type header to the `post_json` method, some routes need it. 2013-07-05 15:45:58 -03:00
Enrico c2a145c2d8 Added ability to create binds when starting a container. 2013-07-05 15:25:52 -03:00
Joffrey F d03d4fb5ca Merge pull request #15 from elbaschid/add_python3_support
Make docker-py compatible with python 3
2013-07-05 10:31:24 -07:00
shin- b3378224b2 Bumped version 2013-07-05 19:08:43 +02:00
shin- f3c91c8d58 Added ChangeLog 2013-07-05 19:07:07 +02:00
shin- 2c186304a8 Added test for Client.build 2013-07-05 19:04:38 +02:00
Sebastian Vetter 48ed4a1d2e Add python 3 support 2013-07-06 00:32:28 +10:00
Enrico 7f458a3232 Added testing info to readme. 2013-07-05 11:05:59 -03:00
Enrico 5831a3b189 Added setup to makefile. 2013-07-05 11:03:04 -03:00
Enrico 8bab36469d Added Makefile with test command. 2013-07-05 10:52:40 -03:00
shin- b7e1ac7069 Fixed logs command 2013-07-03 22:19:41 +02:00
shin- 5ca13da482 Maintain alphabetical order for API methods 2013-07-03 22:00:30 +02:00
shin- f6fce6f2fc Merge branch 'master' of git://github.com/trivio/docker-py into trivio-master 2013-07-03 21:57:53 +02:00
shin- 7a042e0c1a Formatting, implemented ADD in builder (remote only) 2013-07-03 21:52:11 +02:00
shin- e62bc3bd92 Small test fixes 2013-07-03 21:49:31 +02:00
Scott Robertson b39d7b465e don't attach stdin 2013-07-03 08:04:05 -07:00
Scott Robertson b088fc5fe7 add docker.attach() 2013-07-02 20:16:36 -07:00
Joffrey F 9e4fb4003c Merge pull request #11 from kstaken/logging-config
Allow control over the logging done by BuilderClient
2013-07-02 10:08:23 -07:00
Kimbro Staken 763388eb3c Allow control over the logging done by BuilderClient 2013-06-29 02:24:24 -07:00
shin- a75b6633c4 Bumped version to 0.0.5 2013-06-24 21:34:48 +02:00
shin- 66d22c9bba Tests for execution control, run commands as strings, commit/pull (still WIP) 2013-06-24 21:31:59 +02:00
shin- a115b50ef5 use shlex.split when command for create_container is a plain string 2013-06-24 21:30:47 +02:00
Joffrey F 72b533cf3f Merge pull request #8 from ehazlett/master
Adds tag support for builder
2013-06-24 07:38:36 -07:00
Evan Hazlett 33b1af6334 added tag support for builder 2013-06-24 02:05:32 -04:00
shin- 3305949257 (WIP) Added unit tests 2013-06-21 19:59:36 +02:00
shin- 3ffef6dd04 Merge branch 'master' of https://github.com/dotcloud/docker-py 2013-06-21 19:56:54 +02:00
shin- ada06bd56d Fixed quiet option in images() 2013-06-21 19:55:56 +02:00
Ken Cochrane 4f748a9d3f Merge pull request #5 from nickstenning/config-typo
Fix typo -- config is a dictionary
2013-06-21 06:12:45 -07:00
Ken Cochrane 6c57cc9a0c Merge pull request #6 from nickstenning/python3
Python 3 compatibility: relative imports
2013-06-21 06:10:33 -07:00