9df2be80a8
Merge pull request #1717 from aanand/fix-up-docs
...
Fix regression in docs for 'up'
2015-07-20 11:45:50 +01:00
949dd5b2c7
Updating with the latest image
...
Signed-off-by: Mary Anthony <mary@docker.com>
2015-07-19 16:08:01 -07:00
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
2407193594
remove cli
...
Signed-off-by: Mary Anthony <mary@docker.com>
2015-07-17 09:15:29 -07:00
98eab03c61
Merge pull request #1068 from likeon/master
...
Docs: yml link in getting started with django
2015-07-17 17:11:38 +01:00
a3191ab90f
Add container_name option
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-17 15:50:09 +01:00
35092f1d5e
Fix regression in docs for 'up'
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-17 15:29:02 +01:00
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
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
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
03d34336a8
Document DEFAULT_MAX_WORKERS
...
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-07-15 11:56:06 +01:00
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
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
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
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
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
0fa5808389
Merge pull request #1623 from mnowster/documentation-fixes
...
Documentation fixes
2015-07-06 13:25:56 +01:00
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
ae96fc0071
Support reading config from stdin.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-07-02 22:16:22 -04:00
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
ab03f2310b
Include zsh shell
...
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-07-01 16:20:29 +01:00
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
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
4c31741ac9
Include command completion link
...
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-07-01 15:58:10 +01:00
a7a0888446
Re-phrasing for clarity
...
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-07-01 15:58:10 +01:00
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
3906bd067e
Remove redundant import
...
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-07-01 15:58:10 +01:00
8197d0e261
Added uninstall documentation for pip and curl
...
Signed-off-by: Andy Wendt <andy@awendt.com>
2015-06-30 10:27:44 -06:00
52c19bf96c
Fix -d description
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-06-21 13:06:25 -07:00
511fc4a05c
Replace backtick code blocks with indentation
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-06-21 12:37:20 -07:00
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
d0102f0761
Fix completion docs URLs
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2015-06-19 17:57:18 +02:00
c3df62472b
Updating from three ticks to code block
...
Signed-off-by: Mary Anthony <mary@docker.com>
2015-06-19 02:28:09 -07:00
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
77c939b256
Merge pull request #1142 from calou/master
...
Added support of option mac-address
2015-06-17 14:39:00 -07:00
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
acd8dce595
Add upgrading instructions to install docs
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-06-15 10:46:48 -07:00
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
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
d64bf88e26
Merge pull request #1475 from fordhurley/patch-1
...
Fix markdown formatting for `--service-ports` example
2015-05-30 08:43:48 -05:00
bc8d5923e7
Zsh completion for docker-compose
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2015-05-29 14:24:55 +02:00
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
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
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
ad9c5ad938
Fix typo in extends.md
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-05-14 10:48:35 +01:00
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
df87bd91c8
Added devices configuration option
...
Signed-off-by: Dan Elbert <dan.elbert@gmail.com>
2015-05-11 10:50:58 -05:00
99f2a3a583
Merge pull request #1396 from albers/completion-doc
...
Fix markdown formatting issue
2015-05-07 14:04:16 -04:00
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
d6223371d6
Fix markdown formatting issue
...
Signed-off-by: Harald Albers <github@albersweb.de>
2015-05-07 04:41:12 -07:00
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
b06294399a
See #1335 : Added --read-only
...
Signed-off-by: CJ <lim@chernjie.com>
2015-05-02 23:39:39 +08:00
6c95eed781
Merge pull request #1269 from aanand/labels
...
Implement 'labels' option
2015-04-30 20:49:11 -04:00
2e6bc078fb
Implement 'labels' option
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-04-29 16:45:18 +01:00
fed4377ef6
Merge pull request #1351 from mchasal/1301-alphabetize_usage
...
Fix for #1301 , Alphabetize Commands
2015-04-29 14:21:46 +01:00
a89bc304f6
Merge pull request #1075 from KyleJamesWalker/master
...
Support alternate Dockerfile name.
2015-04-27 10:06:43 -04:00
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
3af56e1602
Merge pull request #1200 from chanezon/1148-pat-paul
...
paulczar fixes plus example file
2015-04-27 14:54:14 +01:00
16f8106149
Merge pull request #1158 from chernjie/addhosts
...
Add extra_hosts to yml configuration --add-hosts
2015-04-27 12:26:29 +01:00
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
688f82c1cf
Add cpuset config.
...
Signed-off-by: xuxinkun <xuxinkun@gmail.com>
2015-04-26 00:14:52 +08:00
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
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
d17c4d27fa
Support alternate Dockerfile name.
...
Signed-off-by: Kyle James Walker <KyleJamesWalker@gmail.com>
2015-04-24 08:30:36 -07:00
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
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
8b5015c10f
Bump 1.2.0
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-04-16 17:48:28 +01:00
2a442ec6d9
Adds Where to Get Help section
...
Signed-off-by: Fred Lifton <fred.lifton@docker.com>
2015-04-09 16:23:25 -07:00
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
a1cd00e3f0
Merge pull request #1251 from aanand/extends-guide
...
Add tutorial and reference for `extends`
2015-04-08 15:47:39 +01:00
4f95e81c6d
Merge pull request #1166 from spk/fix_example_env_file
...
Docs: fix env_file example
2015-04-07 15:52:10 +01:00
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
f3f7f000fe
Add tutorial and reference for `extends`
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-04-07 13:46:14 +01:00
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
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
530d7af5cf
Merge pull request #1253 from aanand/production-guide
...
Add guide to using Compose in production
2015-04-06 10:49:49 -07:00
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
eb073c53f4
Merge pull request #1249 from asveepay/update_doc
...
Update install docs for permission denied error
2015-04-03 12:31:38 -07:00
d866415b9a
Update install docs for permission denied error
...
Signed-off-by: Roland Cooper <rcooper@enova.com>
2015-04-03 12:21:15 -05:00
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
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
cec6dc28bb
implemented @fredl suggestions
...
Signed-off-by: Patrick Chanezon <patlist@chanezon.com>
2015-03-27 17:12:29 -07:00
98dd0cd1f8
implemented @aanand comments
...
Signed-off-by: Patrick Chanezon <patlist@chanezon.com>
2015-03-27 13:26:51 -07:00
c441ac90d6
paulczar fixes plus example file
...
Signed-off-by: Patrick Chanezon <patlist@chanezon.com>
2015-03-26 16:35:53 -07:00
59f04c6e29
Fixed typo
...
Signed-off-by: Pascal Borreli <pascal@borreli.com>
2015-03-26 19:03:06 +00:00
965426e39b
Revert "Add 'labels:' config option"
...
This reverts commit 721327110d
2015-03-23 15:04:04 -07:00
721327110d
Add 'labels:' config option
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-03-20 18:12:04 -07:00
4c582e4352
Implement `extends`
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-03-20 15:45:16 -07:00
528bed9ef6
Fix environment resolution
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-03-13 14:22:28 +00:00
f393447ac9
Docs: yml link in getting started with django
...
Signed-off-by: Alexander Sterchov i@likeon.name
2015-03-13 13:50:20 +03:00
08f936b2e7
Fix missing space in rails docs
...
From #1031
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2015-03-04 10:27:25 +00:00
882dc673ce
Edits and revisions to Compose Quickstart guides
2015-02-26 18:58:06 -08:00
ac4e800763
Merge pull request #1009 from aanand/update-docker-install-instructions
...
Point at official Docker install instructions rather than repeating them
2015-02-25 19:11:08 +00:00
2e57575a61
Merge pull request #1018 from aanand/link-to-getting-started-guides
...
Build and link to getting started guides
2015-02-25 19:07:57 +00:00
4ac02bfca6
Ship 1.1.0
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-02-25 18:16:44 +00:00
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
72003de737
Merge pull request #1020 from bfirsh/move-docs-index-higher-up-on-compose-docs
...
Move docs index higher up on index page
2015-02-25 17:52:56 +00:00
bb943d5cb5
Update URLs in documentation
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-02-25 14:58:03 +00:00
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
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
Aanand Prasad
Mary Anthony
Mazz Mosley
Daniel Nephin
Harald Albers
Andy Wendt
Steve Durrheimer
Sébastien Gruchet
Ed Morley
Ford Hurley
Ben Firshman
lsowen
delbert@umn.edu
Vincent Demeester
CJ
xwisen
xuxinkun
Michael Chase-Salerno
Kyle Walker
Sam Wing
Fred Lifton
Aleksandr Vinokurov
Steven Dake
Roland Cooper
Laurent Arnoud
Moysés Borges
Patrick Chanezon
Pascal Borreli
likeon
Sven Dowideit