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

242 Commits

Author SHA1 Message Date
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
Aanand Prasad f3f7f000fe Add tutorial and reference for `extends` 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-04-07 13:46:14 +01: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
Steven Dake 11a2100d53 Add a --pid=host feature to expose the host PID space to the container 
Docker 1.5.0+ introduces a --pid=host feature which allows sharing of PID
namespaces between baremetal and containers.  This is useful for atomic
upgrades, atomic rollbacks, and monitoring.

For more details of a real-life use case, check out:
http://sdake.io/2015/01/28/an-atomic-upgrade-process-for-openstack-compute-nodes/

Signed-off-by: Steven Dake <stdake@cisco.com>
 2015-04-06 11:45:37 -07:00
Fred Lifton 530d7af5cf Merge pull request #1253 from aanand/production-guide 
Add guide to using Compose in production
 2015-04-06 10:49:49 -07:00
Aanand Prasad 502d58abe6 Add guide to using Compose in production 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-04-03 18:56:29 -04:00
Fred Lifton eb073c53f4 Merge pull request #1249 from asveepay/update_doc 
Update install docs for permission denied error
 2015-04-03 12:31:38 -07:00
Roland Cooper d866415b9a Update install docs for permission denied error 
Signed-off-by: Roland Cooper <rcooper@enova.com>
 2015-04-03 12:21:15 -05:00
Laurent Arnoud e3cff5d17d Docs: fix env_file example 
Thanks-to: @aanand
Signed-off-by: Laurent Arnoud <laurent@spkdev.net>
 2015-04-01 11:15:09 +02:00
Moysés Borges 8584525e8d Interpret 'build:' as relative to the yml file 
* This fix introduces one side-effect: the build parameter is now
validated early, when the service dicionary is first constructed.
That leads to less scary stack traces when the path is not valid.

* The tests for the changes introduced here alter the fixtures
of those (otherwise unrelated) tests that make use of the 'build:'
parameter)

Signed-off-by: Moysés Borges Furtado <moyses.furtado@wplex.com.br>
 2015-03-31 18:47:26 -03: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
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