tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-10-17 13:29:11 +02:00
Code Issues Packages Projects Releases Wiki Activity
1,396 Commits 21 Branches 286 Tags
Commit Graph

282 Commits

Author SHA1 Message Date
Aanand Prasad
4ffae4a1ac Merge pull request #1725 from moxiegirl/update-docs-dockerfile 
Updating with the latest image
 2015-07-20 12:00:18 +01:00
Aanand Prasad
5f6d0d0824 Merge pull request #1721 from moxiegirl/remove-boot2docker-1720 
Removing references to boot2docker
 2015-07-20 11:52:15 +01:00
Aanand Prasad
9df2be80a8 Merge pull request #1717 from aanand/fix-up-docs 
Fix regression in docs for 'up'
 2015-07-20 11:45:50 +01:00
Mary Anthony
949dd5b2c7 Updating with the latest image 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-07-19 16:08:01 -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
Mary Anthony
2407193594 remove cli 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-07-17 09:15:29 -07:00
Aanand Prasad
98eab03c61 Merge pull request #1068 from likeon/master 
Docs: yml link in getting started with django
 2015-07-17 17:11:38 +01:00
Aanand Prasad
35092f1d5e Fix regression in docs for 'up' 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-17 15:29:02 +01:00
Mary Anthony
36f4d413fd Updating Compose documentation 
- Split out commands into individual pages for maintainability
- Add full usage in commands pages for usability
- Updated description of the run command
- adding in Aanand's comment

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-07-17 07:05:45 -07:00
Aanand Prasad
ced94a3504 Make smart recreate the default 
Add --force-recreate flag to enable the old default behaviour of
recreating everything.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-17 11:28:02 +01:00
Aanand Prasad
f03dec766d Rename max workers env var and fix docs 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-15 16:43:43 +01:00
Mazz Mosley
03d34336a8 Document DEFAULT_MAX_WORKERS 
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-07-15 11:56:06 +01:00
Aanand Prasad
a8ad13734e Merge pull request #1666 from mnowster/docs-for-extends-file-default-behaviour 
Docs for `file` default behaviour
 2015-07-07 17:12:29 +01:00
Mazz Mosley
ef8ae07145 Docs for file default behaviour 
Change in behaviour, `file` key is optional and if not set the
default is to look within the same file as `extends` is defined.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-07-07 17:01:09 +01:00
Mazz Mosley
6f31e8ebe9 Add support for log_opt 
When specifying a log_driver you want to specify some options for
the logger as per the docker run --log-opt option. The logger
options are key value pairs.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-07-07 16:26:43 +01:00
Mazz Mosley
fc26982132 Add in memswap_limit run option 
By allowing the memswap_limit option to be defined we also need to
check that mem_limit is set, you can't have swap without a limit.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-07-06 17:08:57 +01:00
Daniel Nephin
20218394b9 Merge pull request #1649 from albers/doc-completion-zsh 
Mention zsh command completion in general install section
 2015-07-06 06:41:09 -07:00
Aanand Prasad
0fa5808389 Merge pull request #1623 from mnowster/documentation-fixes 
Documentation fixes
 2015-07-06 13:25:56 +01:00
Harald Albers
2fc7cd6e03 Mention zsh command completion in general install section 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-07-05 19:18:24 +02:00
Daniel Nephin
ae96fc0071 Support reading config from stdin. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-07-02 22:16:22 -04: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
a7a0888446 Re-phrasing for clarity 
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
Andy Wendt
8197d0e261 Added uninstall documentation for pip and curl 
Signed-off-by: Andy Wendt <andy@awendt.com>
 2015-06-30 10:27:44 -06: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
Aanand Prasad
37ee6b0c19 Merge pull request #1575 from moxiegirl/fix-yaml-code 
Updating from three ticks to code block
 2015-06-19 11:55:57 -07:00
Steve Durrheimer
d0102f0761 Fix completion docs URLs 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2015-06-19 17:57:18 +02:00
Mary Anthony
c3df62472b Updating from three ticks to code block 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-06-19 02:28:09 -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
Aanand Prasad
77c939b256 Merge pull request #1142 from calou/master 
Added support of option mac-address
 2015-06-17 14:39:00 -07:00
Sébastien Gruchet
b76ac6e633 Added support to option mac-address 
Signed-off-by: Sébastien Gruchet <gruchet@gmail.com>

Updated doc

Signed-off-by: Sébastien Gruchet <gruchet@gmail.com>

Fixed LINT errors

Signed-off-by: Sébastien Gruchet <gruchet@gmail.com>

Changed mac-address entry order in config keys

Signed-off-by: Sébastien Gruchet <gruchet@gmail.com>

Changed attributes order in docs/yml.md

Signed-off-by: Sébastien Gruchet <gruchet@gmail.com>
 2015-06-17 21:28:17 +02:00
Aanand Prasad
acd8dce595 Add upgrading instructions to install docs 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-15 10:46:48 -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
Ed Morley
e3ba302627 Docs: Update boot2docker shellinit example to use 'eval' 
The boot2docker documentation has since changed the recommended way to
use shellinit - see boot2docker/boot2docker#786.

Signed-off-by: Ed Morley <emorley@mozilla.com>
 2015-06-10 14:38:35 +01:00
Daniel Nephin
d64bf88e26 Merge pull request #1475 from fordhurley/patch-1 
Fix markdown formatting for `--service-ports` example
 2015-05-30 08:43:48 -05:00
Steve Durrheimer
bc8d5923e7 Zsh completion for docker-compose 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2015-05-29 14:24:55 +02:00
Ford Hurley
5945db0fa8 Fix markdown formatting for --service-ports example 
Signed-off-by: Ford Hurley <ford.hurley@gmail.com>
 2015-05-28 15:45:21 -04: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
lsowen
ea7ee301c0 Add security_opt as a docker-compose.yml option 
Signed-off-by: Logan Owen <lsowen@s1network.com>
 2015-05-19 13:47:41 -04:00
Aanand Prasad
ad9c5ad938 Fix typo in extends.md 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-05-14 10:48:35 +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
delbert@umn.edu
df87bd91c8 Added devices configuration option 
Signed-off-by: Dan Elbert <dan.elbert@gmail.com>
 2015-05-11 10:50:58 -05:00
Daniel Nephin
99f2a3a583 Merge pull request #1396 from albers/completion-doc 
Fix markdown formatting issue
 2015-05-07 14:04:16 -04:00
Daniel Nephin
0f2f9db6d8 Merge pull request #1388 from vdemeester/1303-log-driver-support 
Add support for log-driver as a docker-compose.yml option
 2015-05-07 12:00:42 -04:00