tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-04-08 17:05:13 +02:00
Code Issues Packages Projects Releases Wiki Activity
2,050 Commits 23 Branches 268 Tags
1.5.1
Commit Graph

89 Commits

Author SHA1 Message Date
Daniel Nephin
83714fbac2 Touch up intro paragraph with feedback from @moxiegirl. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-03 11:33:23 -05:00
Daniel Nephin
413921a287 Add another feature to the docs - multiple environments per host. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-03 11:33:23 -05:00
Daniel Nephin
7ee36829ac Update intro docs based on feedback. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-03 11:33:23 -05:00
Daniel Nephin
09d2bdbb21 Flush out features and use cases. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-03 11:33:23 -05:00
Daniel Nephin
8733d09a9c Extract the getting started guide from the index page. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-03 11:33:23 -05:00
Sven Dowideit
29b0ffe5e9 Possible link fixes 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-10-27 19:33:28 -04:00
Aanand Prasad
d5f5eb1924 Enable use of Docker networking with the --x-networking flag 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-10-14 11:19:43 -04:00
Daniel Nephin
fbfbe60246 Rename yml.md to compose-file.md and add an alias for the old url. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-14 09:51:34 -04:00
Daniel Nephin
e6344f819a Rename yaml reference to compose file reference. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-14 09:50:37 -04:00
Mary Anthony
0e9c542865 Updating to new tooling:supports Github source linking 
Fixing HEAD
Updating to match daniel
Fixing the index link

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-10-13 14:04:25 -07:00
Daniel Nephin
9b9c8f9cbc Clarify irc details, and remove "infancy" statement. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-09 11:14:21 -04:00
Daniel Nephin
cd48a7026a Cleanup doc reference links. 
Removed 'Compose command line completion' and 'Compose environment variables' from the list. command line completion is linked to from install docs, and environment variables are deprecated.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-09 11:13:24 -04:00
Mary Anthony
62ca8469b0 Fixing misspelling of WordPress 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-09-21 08:58:05 -07:00
mnowster
d577cd6877 Merge pull request from ZJaffee/master 
Change Wordpress > WordPress in the documentation
2015-09-17 15:40:22 +01:00
Zachary Jaffee
fb83b4c6a4 updated wordpress format syntax 
Signed-off-by: Zachary Jaffee <zjaffee@us.ibm.com>
 2015-09-17 09:56:44 -04:00
Aanand Prasad
bbc8765343 Fix typo in docs/index.md 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-09-16 12:38:59 +01:00
moxiegirl
f49fc1867c Merge pull request from charleswhchan/patch-1 
Touch up documentation for Docker Compose.
 2015-09-15 10:17:49 -07:00
Charles Chan
a95ac0f0e0 Touch up documentation for Docker Compose. 
index.md:
* clarify Python & Flask
* minor edits & reformatting

install.md:
* merge the elevated installation instructions with `sudo -i` discussed by @asveepay and @aanand in PR ; fixes  (not sure what happened to the merge, but it's not showing up on the master branch or website)
* minor edits

Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
 2015-09-13 20:00:55 -07:00
Daniel Nephin
4bdf57ead8 Add a where to go next section to the main index page for compose 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-09-10 13:53:26 -04:00
Mazz Mosley
0f60c783fa Remove trailing white space 
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-09-04 17:01:44 +01:00
Charles Chan
000bf1c16a Fix . Remove release notes for old version of Docker Compose. 
Replace by link to the latest CHANGELOG in GitHub.

Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
 2015-09-03 21:18:26 -07:00
Daniel Nephin
59d4f304ee Run pre-commit on all files 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-08-24 17:04:50 -04:00
Mary Anthony
d454a584da Fixing links after crawl 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-08-11 09:38:49 -07:00
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 from xwisen/master 
modified the release notes section the first[PR ]to[PR ]
 2015-04-27 09:56:46 -04:00
Ben Firshman
3af56e1602 Merge pull request 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 ]to[PR ] 
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 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