tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-10-31 03:03:49 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,398 Commits 22 Branches 289 Tags
Commit Graph

66 Commits

Author SHA1 Message Date
Mary Anthony
4ca210edd7 Removing references to boot2docker 
- Replace with machine references
- 1.8 boot2docker is deprecated

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-07-17 16:17:46 -07:00
Mazz Mosley
8a47791161 Re-arrange for the more common case 
boot2docker is the more common case so let's have that one first.
Also be more explicit and clear that the localhost:5000 is applicable
for people running on linux.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-07-01 16:20:29 +01:00
Mazz Mosley
ab03f2310b Include zsh shell 
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-07-01 16:20:29 +01:00
Mazz Mosley
c45c16cead Improve localhost & boot2docker info 
Added a link to boot2docker for those unfamiliar with it.

http://0.0.0.0:5000 didn't resolve for me, however localhost:5000
did, so included reference to that.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-07-01 15:58:11 +01:00
Mazz Mosley
d0c499329e Add a note not to worry 
When reading through the code for the first time and seeing redis,
those unfamiliar with docker first thought might be that they need
to install redis. Adding this sentence helps make it clearer that
this is not needed. Docker will take care of this in services.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-07-01 15:58:10 +01:00
Mazz Mosley
4c31741ac9 Include command completion link 
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-07-01 15:58:10 +01:00
Mazz Mosley
4d69a57edd Include flask output 
When running `docker-compose up`, an extra line of output, from flask,
is outputted. I've included it so anyone new to docker-compose who
sees this output will know that it's expected and not worry that
something might have gone wrong.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-07-01 15:58:10 +01:00
Mazz Mosley
3906bd067e Remove redundant import 
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-07-01 15:58:10 +01:00
Aanand Prasad
52c19bf96c Fix -d description 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-21 13:06:25 -07:00
Aanand Prasad
511fc4a05c Replace backtick code blocks with indentation 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-21 12:37:20 -07:00
Mary Anthony
c26b1c8ee9 Entering fixes from Hugo 
renaming compose-overview back to index
Updating with fixes per Aanand. And others found through test

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-06-17 21:50:43 -07:00
Mary Anthony
e40fc02561 Testing with documentation tooling 
Updating with changes
Updating for Hugo
Adding a README'
moving index.md compose-overview.md in links
changing overview
Updating image to pull

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-06-14 16:00:08 -07:00
Ben Firshman
91ceb33d5a Update description of Compose 
"Define and run multi-container applications with Docker"

Not just development environments, and "complex" is not clear and
not really true.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2015-05-26 15:42:55 +01:00
Ben Firshman
4d745ab87a Link to getting started guides from each page 
These are really hard to find.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2015-05-12 12:44:43 +01:00
Daniel Nephin
a982e516fc Merge pull request #1354 from xwisen/master 
modified the release notes section the first[PR #972]to[PR #1088]
 2015-04-27 09:56:46 -04:00
Ben Firshman
3af56e1602 Merge pull request #1200 from chanezon/1148-pat-paul 
paulczar fixes plus example file
 2015-04-27 14:54:14 +01:00
xwisen
0ca9fa8b2b modified the release notes section the first[PR #972]to[PR #1088] 
Signed-off-by: xwisen <xwisen@gmail.com>
 2015-04-26 13:16:23 +08:00
Fred Lifton
2a442ec6d9 Adds Where to Get Help section 
Signed-off-by: Fred Lifton <fred.lifton@docker.com>
 2015-04-09 16:23:25 -07:00
Fred Lifton
947742852e Prepping for 1.6 release. 
Adds release notes and edits/revises new Compose in production doc.
 2015-04-06 16:47:07 -07:00
Patrick Chanezon
cec6dc28bb implemented @fredl suggestions 
Signed-off-by: Patrick Chanezon <patlist@chanezon.com>
 2015-03-27 17:12:29 -07:00
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
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
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
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
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
5e8bcd2d29 Rejig introduction 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-02-17 10:58:51 +00: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
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
Ben Firshman
d3f88cace5 Mention names of config files on home page 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-10-10 11:06:49 +01:00
Aanand Prasad
b969988ccb Remove references to docker-osx 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-10-06 14:21:49 +01:00
Aanand Prasad
59e31ff544 Update docs to remove numeric suffix 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-08-08 13:08:27 -07:00
Aanand Prasad
a39460d7b2 Merge pull request #392 from bfirsh/more-official-images 
More official images
 2014-08-07 16:42:36 -07:00
Ben Firshman
796df302dd Use official images on getting started guide 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-08-07 14:50:55 -07:00
Ben Firshman
fc3c12ad90 Update repository URL 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-08-07 14:42:49 -07:00
Aanand Prasad
d5854bb625 Merge pull request #388 from orchardup/dockerize 
Point at Docker website and Docker IRC channel
 2014-08-07 10:16:16 -07:00
Ben Firshman
e5f7690137 Point at Docker website and Docker IRC channel 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-08-07 10:15:01 -07:00
Aanand Prasad
c63947b5e2 Merge pull request #383 from orchardup/use-official-repos-on-homepage 
Use official repos on home page
 2014-08-06 16:40:48 -07:00
Ben Firshman
b5d1979d58 Use official repos on home page 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-08-06 16:33:31 -07:00
Ben Firshman
6d64f20ad6 Use hostname on home page example 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-08-06 15:53:45 -07:00
Ben Firshman
2a9aef1332 Use concise fig up output in docs 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-07-09 17:34:39 -07:00
Aanand Prasad
feb8ad7b4c Update Dockerfile reference/tutorial links 2014-06-16 23:32:50 +01:00