tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,039 Commits 20 Branches 267 Tags 58 MiB
Commit Graph

198 Commits

Author SHA1 Message Date
Patrick Chanezon 98dd0cd1f8 implemented @aanand comments 
Signed-off-by: Patrick Chanezon <patlist@chanezon.com>
 2015-03-27 13:26:51 -07:00
Patrick Chanezon c441ac90d6 paulczar fixes plus example file 
Signed-off-by: Patrick Chanezon <patlist@chanezon.com>
 2015-03-26 16:35:53 -07:00
Pascal Borreli 59f04c6e29 Fixed typo 
Signed-off-by: Pascal Borreli <pascal@borreli.com>
 2015-03-26 19:03:06 +00:00
Aanand Prasad 965426e39b Revert "Add 'labels:' config option" 
This reverts commit 721327110d.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-23 15:04:04 -07:00
Aanand Prasad 721327110d Add 'labels:' config option 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-20 18:12:04 -07:00
Aanand Prasad 4c582e4352 Implement `extends` 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-20 15:45:16 -07:00
Aanand Prasad 528bed9ef6 Fix environment resolution 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-13 14:22:28 +00:00
Ben Firshman 08f936b2e7 Fix missing space in rails docs 
From #1031

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2015-03-04 10:27:25 +00:00
Fred Lifton 882dc673ce Edits and revisions to Compose Quickstart guides 2015-02-26 18:58:06 -08:00
Ben Firshman ac4e800763 Merge pull request #1009 from aanand/update-docker-install-instructions 
Point at official Docker install instructions rather than repeating them
 2015-02-25 19:11:08 +00:00
Ben Firshman 2e57575a61 Merge pull request #1018 from aanand/link-to-getting-started-guides 
Build and link to getting started guides
 2015-02-25 19:07:57 +00:00
Aanand Prasad 4ac02bfca6 Ship 1.1.0 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-02-25 18:16:44 +00:00
Aanand Prasad 35d5d1a5b1 Build and link to getting started guides 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-02-25 17:54:02 +00:00
Aanand Prasad 72003de737 Merge pull request #1020 from bfirsh/move-docs-index-higher-up-on-compose-docs 
Move docs index higher up on index page
 2015-02-25 17:52:56 +00:00
Aanand Prasad bb943d5cb5 Update URLs in documentation 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-02-25 14:58:03 +00:00
Ben Firshman 178c50d46f Move docs index higher up on index page 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2015-02-25 14:09:30 +00:00
Sven Dowideit 5b07c581e0 Add an index to the bottom of the Compose docs as they're scattered around docs.docker.com 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-02-25 23:38:25 +10:00
Aanand Prasad 34c6920b37 Point at official Docker install instructions rather than repeating them 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-02-24 11:43:14 +00:00
Ben Firshman b1739e703b Merge pull request #1002 from SvenDowideit/add-links-to-references 
Add links to the main Compose references
 2015-02-24 10:43:34 +00:00
Sven Dowideit c3215a1764 Add links to the main Compose references 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-02-23 16:13:58 +10:00
Sven Dowideit bd320b19fe add ./script/doc to build fig documentation using the docs.docker.com tooling 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-02-23 13:56:13 +10:00
Aanand Prasad d95de03de9 Merge pull request #990 from bfirsh/add-title-to-docs-index 
Add title to docs index
 2015-02-19 16:02:22 +00:00
Ben Firshman e3eccd1047 Merge pull request #979 from aanand/fix-env-docs 
Update environment variable names in docs
 2015-02-19 14:34:48 +00:00
Ben Firshman d32994c250 Add title to docs index 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2015-02-19 14:34:08 +00:00
Aanand Prasad a516d61b49 Update environment variable names in docs 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-02-18 11:39:57 +00:00
Aanand Prasad 6eb1c8896f Merge pull request #952 from fredlf/cli-doc-revision 
Revises Compose cli reference
 2015-02-18 11:38:50 +00:00
Aanand Prasad 5e8bcd2d29 Rejig introduction 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-02-17 10:58:51 +00:00
Ben Firshman 2eb20d89af Merge pull request #904 from fredlf/install-doc-revision 
Revision and edit of Compose install doc
 2015-02-13 12:25:32 +00:00
Fred Lifton 4a33686787 Revises Compose cli reference 2015-02-11 18:22:36 -08:00
Fred Lifton 9f4775c554 Revision and edit of Compose install doc 
Fix rc version to latest.

Signed-off-by: Fred Lifton <fred.lifton@docker.com>
 2015-02-05 17:48:06 -08:00
Aanand Prasad b25ed59b1c Tweak intro 
We shouldn't yet be recommending production use - for now, let's continue to emphasise the development use case and mention staging/CI.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-02-05 16:17:38 -05:00
Ashley Penney 75247e5a54 Fix a small typo. 2015-01-31 20:00:04 -05:00
Sven Dowideit 3b7ea5c055 resolve most of my comments 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-01-30 21:27:57 +10:00
Fred Lifton 461f1ad5d5 Edit and revision of overview & quick start doc 
Signed-off-by: Fred Lifton <fred.lifton@docker.com>
 2015-01-29 19:55:11 -08:00
Sven Dowideit d8d0fd6dc9 Add Docker docs.docker.com meta-data, and reflow to 80-chars to simplify github diffs 
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>
 2015-01-30 13:11:48 +10:00
Aanand Prasad deb2de3c07 Ship 1.1.0-rc2 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-01-29 18:00:10 -05:00
Daniel Nephin 28fa49e569 Merge pull request #810 from madwire/patch-1 
Tweaks to the rails tutorial to bring it inline with rails 4.2 release
 2015-01-27 14:45:31 -05:00
Aanand Prasad 43fdae8bc6 Ship 1.1.0-rc1 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-01-20 22:42:59 +00:00
Aanand Prasad 8297f55f2c Remove all website-related stuff from docs 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-01-20 21:00:23 +00:00
Aanand Prasad 724be54f09 Manual fixes to docs 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-01-20 21:00:23 +00:00
Aanand Prasad e3c4a662d9 Find-and-replace on docs 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-01-20 21:00:23 +00:00
Aanand Prasad 72095f54b2 Merge pull request #639 from albers/bash-completion 
Bash completion for fig command
 2015-01-13 17:46:42 +00:00
Christophe Labouisse aa0c43df96 Add cpu_shares option in fig.yml 
This options maps exactly the docker run option with the same name.

Signed-off-by: Christophe Labouisse <christophe@labouisse.org>
 2015-01-11 20:10:48 +01:00
Daniel Nephin b903217a4a Merge pull request #544 from LuminosoInsight/external-links 
Allow links to containers outside of the project
 2015-01-08 10:39:00 -05:00
Harald Albers 2406a3936a Documentation for bash completion 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-01-08 15:18:39 +01:00
Richard Adams 9a90a27376 be explicit with a ruby version number in the Dockerfile 
Signed-off-by: Richard Adams <richard@madwire.co.uk>
 2015-01-07 19:45:00 +00:00
Richard Adams 3b638f0c43 tweaks to the rails tutorial to bring it inline with rail 4.2 release 
Due to a change in Rack, rails server now listens on localhost instead of 0.0.0.0 by default.

Signed-off-by: Richard Adams <richard@madwire.co.uk>
 2015-01-07 17:06:47 +00:00
Christophe Labouisse 91c90a722a Added missing options 
The stdin_open and tty options are supported by fig but were missing from the documentation.

Signed-off-by: Christophe Labouisse <christophe@labouisse.org>
 2015-01-03 23:20:10 +01:00
Jason Bernardino Alonso 4257707244 Accept an external_links list in the service configuration dictionary to create links to containers outside of the project 
Signed-off-by: Jason Bernardino Alonso <jalonso@luminoso.com>
Signed-off-by: Mauricio de Abreu Antunes <mauricio.abreua@gmail.com>
 2014-12-30 15:31:33 -05:00
Aanand Prasad 0e172228d1 Merge pull request #485 from squebe/run-service-ports 
Added map service ports option for run command.
 2014-12-19 14:17:57 -08:00