tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,301 Commits 25 Branches 265 Tags 53 MiB
Commit Graph

258 Commits

Author SHA1 Message Date
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
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
Harald Albers d6223371d6 Fix markdown formatting issue 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-05-07 04:41:12 -07:00
Vincent Demeester f626fc5ce8 Add support for log-driver in docker-compose.yml 
Closes #1303

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-05-06 13:18:58 +02:00
CJ b06294399a See #1335: Added --read-only 
Signed-off-by: CJ <lim@chernjie.com>
 2015-05-02 23:39:39 +08:00
Daniel Nephin 6c95eed781 Merge pull request #1269 from aanand/labels 
Implement 'labels' option
 2015-04-30 20:49:11 -04:00
Aanand Prasad 2e6bc078fb Implement 'labels' option 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-04-29 16:45:18 +01:00
Aanand Prasad fed4377ef6 Merge pull request #1351 from mchasal/1301-alphabetize_usage 
Fix for #1301, Alphabetize Commands
 2015-04-29 14:21:46 +01:00
Daniel Nephin a89bc304f6 Merge pull request #1075 from KyleJamesWalker/master 
Support alternate Dockerfile name.
 2015-04-27 10:06:43 -04: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
Aanand Prasad 16f8106149 Merge pull request #1158 from chernjie/addhosts 
Add extra_hosts to yml configuration --add-hosts
 2015-04-27 12:26:29 +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
xuxinkun 688f82c1cf Add cpuset config. 
Signed-off-by: xuxinkun <xuxinkun@gmail.com>
 2015-04-26 00:14:52 +08:00
Michael Chase-Salerno 9a44708081 Fix for #1301, Alphabetize Commands 
Signed-off-by: Michael Chase-Salerno <bratac@linux.vnet.ibm.com>
 2015-04-24 20:45:18 +00:00
Daniel Nephin 89789c54ad Merge pull request #1232 from aleksandr-vin/add-parent-directories-search-for-default-compose-files 
Add parent directories search for default compose-files
 2015-04-24 13:12:24 -04:00
Kyle Walker d17c4d27fa Support alternate Dockerfile name. 
Signed-off-by: Kyle James Walker <KyleJamesWalker@gmail.com>
 2015-04-24 08:30:36 -07:00
CJ 25ee3f0033 Remove extra s from --add-host 
linting...
six.string_types
list-of-strings in examples
disallow extra_hosts support for list-of-dicts
A more thorough sets of tests for extra_hosts
Provide better examples
As per @aanand's [comment](https://github.com/docker/compose/pull/1158/files#r28326312)

  I think it'd be better to check `if not isinstance(extra_hosts_line,
  six.string_types)` and raise an error saying `extra_hosts_config must be
  either a list of strings or a string->string mapping`. We shouldn't need
  to do anything special with the list-of-dicts case.
order result to work with assert
use set() instead of sort()

Signed-off-by: CJ <lim@chernjie.com>
 2015-04-24 09:21:29 +08:00
Sam Wing fb81c37ca6 added the extra_hosts option to the yml configuration which exposes the --add-host flag from the docker client 
Signed-off-by: Sam Wing <sampwing@gmail.com>
 2015-04-23 21:54:59 +08:00
Aanand Prasad 8b5015c10f Bump 1.2.0 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-04-16 17:48:28 +01: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
Aleksandr Vinokurov ceff5cb9ca Add parent directories search for default compose-files 
Does not change directory to the parent with the compose-file found.
Works like passing '--file' or setting 'COMPOSE_FILE' with absolute path.
Resolves issue #946.

Signed-off-by: Aleksandr Vinokurov <aleksandr.vin@gmail.com>
 2015-04-09 22:36:47 +00:00
Ben Firshman a1cd00e3f0 Merge pull request #1251 from aanand/extends-guide 
Add tutorial and reference for `extends`
 2015-04-08 15:47:39 +01:00
Aanand Prasad 4f95e81c6d Merge pull request #1166 from spk/fix_example_env_file 
Docs: fix env_file example
 2015-04-07 15:52:10 +01:00
Aanand Prasad 619e783a05 Merge pull request #1011 from sdake/master 
Add a --pid=host feature to expose the host PID space to the container
 2015-04-07 13:49:53 +01:00