jyapayne/compose
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2,666 commits 9 branches 77 tags 9.3 MiB
Commit graph

480 commits

Author SHA1 Message Date
Aanand Prasad
068a9f78dd Update note about build + image with extends 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-03-02 10:35:22 -08:00
Victoria Bialas
8bf4d4e8cb updated Wordpress example to be easier to follow, added/updated images 
docs update per Mary's comments on the PR

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2016-03-02 10:35:12 -08:00
Victoria Bialas
93624c9fa5 update to description of files generated from examples, which are no longer owned by root w/new release 
updated descriptions of changing file ownership and images per Seb's comments

fixed line wraps

fixed line breaks per Joffrey's comments

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2016-03-02 10:34:26 -08:00
Aanand Prasad
4d720279a0 Bump 1.6.2 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-23 15:52:13 -08:00
Daniel Nephin
a75c16cb1b Bump 1.6.1 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-23 12:08:56 -08:00
Mary Anthony
e08409f18d Updating Dockerfile 
Signed-off-by: Mary Anthony <mary@docker.com>
 2016-02-23 12:08:56 -08:00
Victoria Bialas
f8e3c46fbb copyedit to make show as file format 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2016-02-23 11:52:51 -08:00
Victoria Bialas
f7c923062d corrected description of network aliases, added real-world example per #2907 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2016-02-23 11:52:51 -08:00
Joffrey F
61906ac2ff Update documentation for volume_driver option. 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-23 11:52:51 -08:00
Daniel Nephin
8d7b1e9047 Update guides to use v2 config format. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-23 11:52:51 -08:00
Daniel Nephin
6d2aa80435 Update link to docker volume create docs. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-23 11:52:51 -08:00
Joffrey F
f4a22b94ed Handle mismatched network formats in config files 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-23 11:52:51 -08:00
Joffrey F
e5689afe4c Network aliases are now part of the network dictionary 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-23 11:52:51 -08:00
Joffrey F
353da73eab Document network_aliases config 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-23 11:52:51 -08:00
Manuel Kaufmann
c7687592ff Typo fixed 
Signed-off-by: Manuel Kaufmann <humitos@gmail.com>
 2016-02-23 11:52:51 -08:00
Yohan Graterol
cea7911f56 Typo into the doc with networks in yaml 
Signed-off-by: Yohan Graterol <yohangraterol92@gmail.com>
 2016-02-23 11:52:51 -08:00
Aanand Prasad
a716bdc482 Update Swarm integration guide and make it an official part of the docs 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-23 11:52:51 -08:00
Aanand Prasad
d99cad60e7 Bump 1.6.0 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-04 19:43:26 +00:00
Ben Firshman
8199c4a6e1 Improve names in Compose file 2 example 
Just makes it a bit clearer what's going on.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-02-04 19:43:26 +00:00
Daniel Nephin
a55210413c Update docs for version being a string. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-04 17:21:15 +00:00
Spencer Rinehart
6caa188730 Fix example formatting for depends_on. 
Markdown was acting against expectations here by merging the example indented YAML into the previous list item instead of treating it as a code block.

I decided that a better way of handling this would be to add a "Simple example:" line that is also used elsewhere in this file.  It resets the markdown indentation in a way that works.

Signed-off-by: Spencer Rinehart <anubis@overthemonkey.com>
 2016-02-04 15:57:29 +00:00
Mary Anthony
a59982eb11 Fixing duplicate identifiers 
Signed-off-by: Mary Anthony <mary@docker.com>
 2016-02-03 18:21:44 +00:00
Daniel Nephin
46f33f12b0 Update merge docs with depends_on, and correction about how links and volumes_from are merged. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-03 18:21:44 +00:00
Daniel Nephin
7f009aeeb9 Move command reference to overview. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-03 18:21:44 +00:00
Daniel Nephin
44c7d080bd Rename the old environment variable page to link environment variables. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-03 18:21:43 +00:00
Daniel Nephin
32bd760526 Cleanup command-line reference docs by renaming overview to envvars. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-03 18:21:43 +00:00
Daniel Nephin
009dbbe971 Use the same capitalization for all menu items in the docs. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-03 18:21:43 +00:00
Daniel Nephin
6b59ba0c31 Re-order compose docs so that quickstart guides come before other documentation. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-03 18:21:43 +00:00
Mary Anthony
fbe8484377 New navigation for 1.10 release 
Updating with Joffrey's comments

Signed-off-by: Mary Anthony <mary@docker.com>
 2016-02-01 15:51:15 +00:00
Aanand Prasad
9249ec62c2 Add note about named volumes to upgrade guide 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-01 15:51:15 +00:00
Aanand Prasad
4537ec70cc Remove outdated warnings about links from docs 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-27 13:33:38 +00:00
Aanand Prasad
695c692be6 Bump 1.6.0-rc2 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-27 01:42:21 +00:00
Aanand Prasad
297d20f085 Remove ability to join bridge network + user-defined networks 
Containers connected to the bridge network can't have aliases, so it's
simpler to rule that they can *either* be connected to the bridge
network (via `network_mode: bridge`) *or* be connected to user-defined
networks (via `networks` or the default network).

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-27 01:42:21 +00:00
Aanand Prasad
7f4a94514b Fix trailing whitespace in docker-compose.md 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-26 23:41:47 +00:00
Tobias Munk
c0fe545947 fixed documentation about traversing yml files 
Signed-off-by: Tobias Munk <schmunk@usrbin.de>
 2016-01-26 18:58:15 +00:00
Aanand Prasad
2b7306967b Implement network_mode in v2 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-26 11:52:23 +00:00
Dimitar Bonev
5545c55ecc Network fields schema validation 
Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com>
 2016-01-26 11:52:22 +00:00
Daniel Nephin
bf068a8287 Add stop signal to the docs. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-26 11:52:22 +00:00
Joffrey F
38a6d04852 Update documentation for external param 
Signed-off-by: Joffrey F <joffrey@docker.com>

Conflicts:
	docs/compose-file.md
 2016-01-26 11:52:22 +00:00
Aanand Prasad
0952c1bb51 Add links to networks key references 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-26 11:52:21 +00:00
Aanand Prasad
18a1829db0 Update documentation for links 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-26 11:52:21 +00:00
Aanand Prasad
e40de088f3 Document depends_on 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-26 11:52:21 +00:00
Aanand Prasad
6fe54f5c24 Update Compose file documentation for version 2 
- Explain each version in its own section
- Explain how to upgrade from version 1 to 2
- Note which keys are restricted to particular versions
- A few corrections to the docs for version-specific keys

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-26 11:52:21 +00:00
Daniel Nephin
d2556a1347 Bump 1.6.0-rc1 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-18 14:50:56 -05:00
Aanand Prasad
d4720f85ef Update networking docs 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-18 14:03:52 -05:00
Joffrey F
1ae57d92d4 Remove duplicate functions 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-14 14:39:06 -08:00
Garrett Heel
9cfa71ceee Add support for build arguments 
Allows 'build' configuration option to be specified as an
object and adds support for build args.

Signed-off-by: Garrett Heel <garrettheel@gmail.com>
 2016-01-14 12:14:56 -08:00
Daniel Nephin
77b4ebc31f Merge pull request #2591 from moxiegirl/remove-todo 
Fixing TODO visible in docs
 2016-01-14 15:06:38 -05:00
Daniel Nephin
c64af0a459 Add an acceptance test and docs for the down subcommand 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-14 11:11:08 -05:00
Michael A. Smith
9bff308251 Document Entrypoints and Commands as Lists 
Signed-off-by: Michael A. Smith <msmith3@ebay.com>
 2016-01-13 17:47:30 -05:00