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

515 Commits

Author SHA1 Message Date
Joffrey F 7a30fc0983 Merge pull request #3089 from ltiao/patch-1 
Fixed indentation level in example.
 2016-03-09 10:56:50 -08:00
Aanand Prasad e700d7ca6a Fix version in docs example 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-03-08 18:15:18 +01:00
Louis Tiao 88a719b4b6 Fixed indentation level in example. 
Signed-off-by: Louis Tiao <louistiao@gmail.com>
 2016-03-08 15:53:55 +11:00
Daniel Nephin 53a3d14046 Support multiple files in COMPOSE_FILE env var. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-03-02 18:47:58 -05:00
Aanand Prasad 1655be6c5b Merge pull request #2601 from dnephin/dont_build_on_up 
Only build as part of `up` if `--build` flag is set
 2016-03-02 15:02:18 -08:00
Daniel Nephin e1b87d7be0 Update reference docs for the new flag. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-03-02 15:32:51 -05:00
Aanand Prasad 3f3c05e465 Merge pull request #3049 from aanand/clarify-depends-on 
Clarify depends_on logic
 2016-03-02 11:59:06 -08:00
Aanand Prasad aa7b862f4c Clarify depends_on logic 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-03-02 10:29:24 -08:00
Aanand Prasad 0b3561a7d5 Merge pull request #2720 from seguins/2227-improvements-logs 
Add flags on logs
 2016-03-01 17:41:31 -08:00
Stéphane Seguin 9b36dc5c54 Add --tail flag as option on logs. 
Closes #265
Signed-off-by: Stéphane Seguin <stephseguin93@gmail.com>
 2016-03-01 20:23:46 +01:00
Stéphane Seguin d9b4286f91 Add -t, --timestamps flag as option on logs. 
Signed-off-by: Stéphane Seguin <stephseguin93@gmail.com>
 2016-03-01 20:23:46 +01:00
Stéphane Seguin 82632098a3 Add -f, --follow flag as option on logs. 
Closes #2187
Signed-off-by: Stéphane Seguin <stephseguin93@gmail.com>
 2016-03-01 20:23:43 +01:00
Aanand Prasad 7684604830 Merge pull request #3023 from londoncalling/fix-note-3019 
WIP: updated note format for dockerfile per Aanand's comments on PR #…
 2016-03-01 11:11:55 -08:00
Aanand Prasad fc99c7ee19 Merge pull request #2584 from mjgpy3/patch-1 
Update `volumes_from` docs to state default
 2016-02-29 15:37:46 -08:00
Daniel Nephin f5ce31d43e Merge pull request #3024 from aanand/update-build-image-docs 
Update docs about using build and image together
 2016-02-29 14:03:54 -08:00
Daniel Nephin 4db1fef58c Merge pull request #3022 from aanand/update-build-image-extends-note 
Update note about build + image with extends
 2016-02-29 14:03:28 -08:00
Daniel Nephin 8d24af92e0 Merge pull request #3030 from aanand/document-startup-order-workarounds 
Document ways to make services wait for dependencies
 2016-02-29 13:01:32 -08:00
Aanand Prasad 6b947ee478 Document ways to make services wait for dependencies 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-29 11:24:58 -08:00
Tomas Tomecek d28c5dda92 implement exec 
Resolves #593

Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
 2016-02-29 10:50:09 +01:00
Aanand Prasad 62fb6b99eb Update FAQ regarding long stop times 
- It happens on recreate, not just stop

- We now support `stop_signal`, which can help in some cases

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-26 14:34:44 -08:00
Aanand Prasad c72e9b3843 Add release notes for 1.6.2 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-25 17:55:04 -08:00
Aanand Prasad 5be48ba1ed Update docs about using build and image together 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-25 17:19:58 -08:00
Victoria Bialas 5cc420e727 WIP: updated note format for dockerfile per Aanand's comments on PR #3019 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2016-02-25 16:47:46 -08:00
Aanand Prasad 2cd1b94dd3 Update note about build + image with extends 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-25 15:15:18 -08:00
Daniel Nephin 49ef8a271d Add release notes for 1.6.1 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-23 15:13:01 -08:00
Victoria Bialas e6797e1166 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-02-23 11:59:19 -08:00
Joffrey F 176b966486 Update documentation for volume_driver option. 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-22 16:51:33 -08:00
Daniel Nephin c7ceacfeae Merge pull request #2948 from dnephin/validate_top_level 
Validate that each section of the config is a mapping
 2016-02-19 13:41:50 -05:00
Aanand Prasad bed0cfeb32 Merge pull request #2807 from aanand/swarm-doc 
Update Swarm integration guide and make it an official part of the docs
 2016-02-19 10:25:28 -08:00
Daniel Nephin 0d218c34c7 Make config validation error messages more consistent. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-19 13:12:57 -05:00
Aanand Prasad 520c695bf4 Update Swarm integration guide and make it an official part of the docs 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-19 09:32:43 -08:00
Victoria Bialas eb4a98c0d1 corrected description of network aliases, added real-world example per #2907 
copyedit to make  show as file format

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2016-02-18 18:05:52 -08:00
Joffrey F 7152f7ea76 Handle mismatched network formats in config files 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-18 15:24:41 -08:00
Joffrey F 825a0941f0 Network aliases are now part of the network dictionary 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-18 15:23:47 -08:00
Joffrey F 7801cfc5d1 Document network_aliases config 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-18 15:23:47 -08:00
Daniel Nephin 471264239f Update guides to use v2 config format. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-16 16:43:26 -05:00
Daniel Nephin 4de12ad7a1 Update link to docker volume create docs. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-16 16:43:22 -05:00
Victoria Bialas 8af0a0f85b 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-02-16 11:34:59 -08:00
moxiegirl b8c35e1298 Merge pull request #2884 from moxiegirl/remove-tutorials 
Updating Dockerfile
 2016-02-16 08:09:49 -08:00
Daniel Nephin 7bae4cdbb2 Merge pull request #2875 from aanand/fix-version-in-install-guide 
Fix version in install guide
 2016-02-11 12:43:51 -05:00
Aanand Prasad b8f7bbb84e Merge pull request #2830 from nubs/master 
Add support for shm_size.  Fixes #2823.
 2016-02-11 17:34:44 +00:00
Mary Anthony 643166ae98 Updating Dockerfile 
Signed-off-by: Mary Anthony <mary@docker.com>
 2016-02-10 20:47:15 -08:00
Manuel Kaufmann ac14642d94 Typo fixed 
Signed-off-by: Manuel Kaufmann <humitos@gmail.com>
 2016-02-10 19:00:17 -05:00
Spencer Rinehart 5e6dc3521c Add support for shm_size. Fixes #2823. 
shm_size controls the size of /dev/shm in the container and requires
Docker 1.10 or newer (API version 1.22).  This requires docker-py 1.8.0
(docker/docker-py#923).

Similar to fields like `mem_limit`, `shm_size` may be specified as
either an integer or a string (e.g., `64M`).

Updating docker-py to the master branch in order to get the unreleased
dependency on `shm_size` there in place.

Signed-off-by: Spencer Rinehart <anubis@overthemonkey.com>
 2016-02-10 15:25:18 -06:00
Aanand Prasad c43b25b0cf Merge pull request #2827 from loic/patch-1 
Fixed typo in compose-file.md
 2016-02-10 15:58:54 +00:00
Aanand Prasad ab6e07da7d Fix version in install guide 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-10 15:56:50 +00:00
Yohan Graterol 59a2920758 Typo into the doc with `networks` in yaml 
Signed-off-by: Yohan Graterol <yohangraterol92@gmail.com>
 2016-02-09 18:45:04 -05:00
Loïc Bistuer b635647105 Fixed typo in compose-file.md 
Signed-off-by: Loïc Bistuer <loic.bistuer@gmail.com>
 2016-02-05 09:50:22 +07:00
Aanand Prasad 869e815213 Bump 1.7.0dev 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-04 23:46:41 +00:00
Aanand Prasad 422ff623b4 Merge pull request #2819 from bfirsh/improve-names-in-compose-file-2-example 
Improve names in Compose file 2 example
 2016-02-04 19:42:22 +00:00