5037 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Andy Rothfusz	e3c3f3c324	Merge pull request #3010 from SvenDowideit/origin/docker-ps-linked-container-alias-example ... add an example of docker ps, and also of link aliases	2013-12-05 14:00:53 -08:00
Guillaume J. Charmes	797bac2344	Merge pull request #3057 from crosbymichael/test-cpu-share ... Move test cpu shares out of test start	2013-12-05 13:58:01 -08:00
Josh Poimboeuf	7a94cdf8ed	create the bridge device with ioctl ... On RHEL 6, creation of a bridge device with netlink fails. Use the more backward-compatible ioctl instead. This fixes networking on RHEL 6.	2013-12-05 15:32:15 -06:00
Lokesh Mandvekar	61fbf3d8e2	yum upgrade on fedora not required before install ... Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>	2013-12-05 14:21:03 -06:00
Lokesh Mandvekar	f49eb29497	use mattdm/fedora in fedora doc and other cosmetic changes ... Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>	2013-12-05 14:03:17 -06:00
Guillaume J. Charmes	1525f71b5a	Merge pull request #3016 from pnasrat/3014-clarify-maintainer-process ... Add a proposal step for potential MAINTAINERS.	2013-12-05 11:28:30 -08:00
Guillaume J. Charmes	4188cd6bcd	Merge pull request #3024 from jamtur01/ubunturepo ... Added note about Ubuntu curl installation	2013-12-05 11:27:46 -08:00
Andy Rothfusz	e304e8936b	Merge pull request #3038 from SvenDowideit/2485-ambassador-pattern-doc ... initial stab at writing a use/ambassador-pattern howto	2013-12-05 11:01:27 -08:00
James Turnbull	03f8a3bbae	Fixed #2136 - Added styles ... Added styling for versionadded, versionchanged, and deprecated.	2013-12-05 13:46:15 -05:00
Guillaume J. Charmes	066b961a0c	Merge pull request #3060 from dotcloud/sd_notify ... sd_notify ready status when accepting API requests	2013-12-05 10:33:29 -08:00
Victor Vieux	f95f2789f2	add docs for the new json format	2013-12-05 10:12:22 -08:00
Victor Vieux	a8e99d9235	Merge pull request #2917 from codeaholics/2698-only-tag-top-layer ... Only tag the top-most layer when pushing to a registry	2013-12-05 10:02:57 -08:00
Johan Euphrosine	5a17c208cd	docs/installation/google: add enabling Google Compute Engine step	2013-12-05 09:43:08 -08:00
Sven Dowideit	e9bf971e69	use the Makefile in the dev environment documentation - its way less typing, and fewer typing mistakes	2013-12-05 21:48:35 +10:00
Roberto Gandolfo Hashioka	909da5d524	- Added link to the source code repo on github	2013-12-04 21:08:44 -08:00
Sven Dowideit	04c32495f6	add a little prose to tell the user that run creates a container, and then starts it	2013-12-05 14:20:16 +10:00
Sven Dowideit	af020e2d67	I was reading the doc, and noticed that some examples didnt use $ sudo docker, so this makes it a little more consistent	2013-12-05 14:14:08 +10:00
Andy Rothfusz	94d46a8d3a	Merge pull request #2991 from fortybillion/patch-1 ... API documentation: added format of Volumes and Binds parameters to "create" and "start"	2013-12-04 18:32:19 -08:00
Andy Rothfusz	ec9f2f1d0f	Merge branch '2971-cleanconflicts'	2013-12-04 18:26:45 -08:00
Andy Rothfusz	0bfa22124e	Merge branch 'pgdoc' of github.com:jamtur01/docker into 2971-cleanconflicts ... Conflicts: docs/sources/examples/postgresql_service.rst	2013-12-04 18:25:58 -08:00
Victor Vieux	79031c4f8c	Merge pull request #2907 from goldmann/iptables-fix ... Make sure the firewall rules are created even if the bridge interface is already created	2013-12-04 18:04:57 -08:00
Victor Vieux	5f55c1aee1	Merge pull request #2966 from andrewsmedina/govet2 ... fixed some `go vet` issues.	2013-12-04 17:57:10 -08:00
Solomon Hykes	b4e21ad1da	Add Sven Dowideit to docs maintainers	2013-12-04 17:50:33 -08:00
Victor Vieux	97088ebef7	sd_notify ready status when accepting API requests	2013-12-04 17:50:20 -08:00
Solomon Hykes	c35cebaa06	Merge pull request #3031 from jamtur01/docsmaintain ... Add James Turnbull to docs maintainers	2013-12-04 17:48:45 -08:00
Victor Vieux	41b5e87873	Merge pull request #2993 from jpoimboe/rhel6-version-check ... remove kernel version warning on rhel 6.5	2013-12-04 17:46:20 -08:00
Andy Rothfusz	9dfc7bc36f	Merge pull request #2834 from fj/topic/clarify-aws-instructions ... Fix installing-on-AWS workflow description	2013-12-04 17:25:35 -08:00
Guillaume J. Charmes	afbea3f13f	Merge pull request #3058 from dotcloud/add_stderr_hijack ... fix docker run -a stderr	2013-12-04 17:16:56 -08:00
Andy Rothfusz	5dab47a475	Merge pull request #2886 from jamtur01/fedora_community ... Updated Fedora docs	2013-12-04 17:12:00 -08:00
Victor Vieux	3ba279a370	fix docker run -a stderr	2013-12-04 17:08:14 -08:00
Guillaume J. Charmes	944c1f10ea	Merge pull request #2967 from crosbymichael/return-host-config ... Add hostconfig to container inspect	2013-12-04 16:50:42 -08:00
Michael Crosby	0d1506adb3	Move test cpu shares out of test start ... Fixes #2107	2013-12-04 16:31:09 -08:00
Michael Crosby	3a8222dfa5	Merge pull request #3032 from tianon/makefile-tweaks ... Tweak Makefile for consistency and Ctrl+C-ability	2013-12-04 16:04:47 -08:00
Tianon Gravi	00030ced4b	Tweak Makefile for consistency and Ctrl+C-ability (also, -rm to keep it clean)	2013-12-04 16:56:01 -07:00
Andy Rothfusz	f95621fd05	Merge pull request #3033 from proppy/add-compute-docs ... Add Google Cloud Platform installation docs	2013-12-04 15:05:07 -08:00
Guillaume J. Charmes	4328926acc	Merge pull request #3020 from crosbymichael/remove-init-layer ... Ensure that the init layer is removed with the container	2013-12-04 14:46:48 -08:00
Johan Euphrosine	3df5d120de	docs/installation: add google compute engine quickstart	2013-12-04 12:25:22 -08:00
Victor Vieux	1b5517b68f	Merge pull request #3046 from dotcloud/fix_offline_image_transfert_jsonmessage ... Fix offline image transfer jsonmessage	2013-12-04 12:05:28 -08:00
Victor Vieux	4bc100b494	fix jsonmessage	2013-12-04 11:57:18 -08:00
Victor Vieux	be282b57d5	fix offline image transfert	2013-12-04 11:55:42 -08:00
Victor Vieux	12180948be	remove unused parameter in Download	2013-12-04 11:54:11 -08:00
Victor Vieux	6cf2c14c00	Merge pull request #2796 from EmilHernvall/master ... Support for same port on multiple interfaces	2013-12-04 11:15:51 -08:00
Michael Crosby	dc9f8bf072	Merge pull request #2790 from proppy/fix-tar ... utils: remove dotcloud/tar dep	2013-12-04 11:06:13 -08:00
Michael Crosby	0862756beb	Merge pull request #3018 from pnasrat/3017-debug-expvar ... Expose expvar endpoint during debugging.	2013-12-04 10:53:35 -08:00
Andy Rothfusz	de60bee3d4	Merge pull request #2946 from dhrp/doc-postgres-typo ... Fixed some grammar and one other line in postgres example	2013-12-04 10:51:02 -08:00
Michael Crosby	51b9fe7301	Merge pull request #3000 from creack/improve_make_sh_test ... Improve make sh test	2013-12-04 10:41:55 -08:00
Michael Crosby	61aad8fc10	Merge pull request #3029 from pnasrat/container-refactoring ... Container refactoring	2013-12-04 10:35:42 -08:00
Sven Dowideit	6ddea783ef	initial stab at writing a use/ambassador-pattern howto (Issue #2485)	2013-12-04 16:47:45 +10:00
Roberto Gandolfo Hashioka	58c33360b0	- Updated the doc with the current implementation status	2013-12-03 16:39:23 -08:00
Paul Nasrat	40fe9f581b	Extract volume bind, creation and external methods. ... Make Start() slightly more readable.	2013-12-03 18:58:31 -05:00