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

947 Commits

Author SHA1 Message Date
Ben Firshman 17bbb9d357 Merge pull request #1017 from aanand/swarm-doc 
Document Swarm integration
 2015-02-25 12:53:07 +00:00
Aanand Prasad ec2966222a Document Swarm integration 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-02-25 10:45:40 +00:00
Aanand Prasad 8076c7d7fe Merge pull request #1010 from bfirsh/add-create-message-when-scaling-containers 
Log "creating container" when scaling
 2015-02-24 14:09:12 +00:00
Ben Firshman b2425c1f1e Log "creating container" when scaling 
If an image needs pulling, it just looks like it's hanging.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2015-02-24 13:39:38 +00:00
Ben Firshman 8d8dd37d2c Merge pull request #924 from aanand/update-contributing 
Add checklist item for completion script URL to CONTRIBUTING.md
 2015-02-24 10:44:16 +00:00
Ben Firshman b1739e703b Merge pull request #1002 from SvenDowideit/add-links-to-references 
Add links to the main Compose references
 2015-02-24 10:43:34 +00:00
Ben Firshman a42f2007ea Merge pull request #1001 from SvenDowideit/build-docs-in-local-fig-repo 
add ./script/doc to build fig documentation using the docs.docker.com to...
 2015-02-23 22:45:59 +00:00
Aanand Prasad 1dd5ef4133 Merge pull request #619 from bfirsh/add-script-which-runs-fig-inside-docker 
Add script which runs Fig inside Docker
 2015-02-23 18:20:33 +00:00
Sven Dowideit c3215a1764 Add links to the main Compose references 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-02-23 16:13:58 +10:00
Sven Dowideit bd320b19fe add ./script/doc to build fig documentation using the docs.docker.com tooling 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-02-23 13:56:13 +10:00
Ben Firshman 0fa0131372 Add script which runs Fig inside Docker 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2015-02-20 14:33:15 +00:00
Aanand Prasad a7fe67e691 Merge pull request #991 from aanand/credit-contributors 
Credit contributors in CHANGES.md
 2015-02-19 18:08:45 +00:00
Aanand Prasad f78dfa7958 Credit contributors in CHANGES.md 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-02-19 17:42:33 +00:00
Aanand Prasad d95de03de9 Merge pull request #990 from bfirsh/add-title-to-docs-index 
Add title to docs index
 2015-02-19 16:02:22 +00:00
Ben Firshman e3eccd1047 Merge pull request #979 from aanand/fix-env-docs 
Update environment variable names in docs
 2015-02-19 14:34:48 +00:00
Ben Firshman d32994c250 Add title to docs index 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2015-02-19 14:34:08 +00:00
Aanand Prasad a516d61b49 Update environment variable names in docs 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-02-18 11:39:57 +00:00
Aanand Prasad 6eb1c8896f Merge pull request #952 from fredlf/cli-doc-revision 
Revises Compose cli reference
 2015-02-18 11:38:50 +00:00
Ben Firshman 160e2dc7b9 Merge pull request #949 from aanand/update-intro 
Rejig introduction
 2015-02-18 09:46:16 +00:00
Aanand Prasad 5e8bcd2d29 Rejig introduction 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-02-17 10:58:51 +00:00
Ben Firshman 2eb20d89af Merge pull request #904 from fredlf/install-doc-revision 
Revision and edit of Compose install doc
 2015-02-13 12:25:32 +00:00
Aanand Prasad ab65c829ea Merge pull request #960 from bfirsh/remove-nathanleclaire-as-maintainer 
Remove @nathanleclaire as a maintainer
 2015-02-13 11:59:27 +00:00
Aanand Prasad 83110b8e6b Merge pull request #959 from bfirsh/tidy-up-contributing-guidelines 
Tidy up contributing guidelines
 2015-02-13 11:43:05 +00:00
Ben Firshman 0a8f9abfae Remove @nathanleclaire as a maintainer 
Thanks for your help <3

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2015-02-12 16:39:59 +00:00
Ben Firshman 3146fe5e4b Tidy up contributing guidelines 
- Add intro saying we roughly follow the Docker project's guidelines
- Link to Docker's signing off docs
- Fix formatting at bottom

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2015-02-12 13:40:02 +00:00
Fred Lifton 4a33686787 Revises Compose cli reference 2015-02-11 18:22:36 -08:00
Aanand Prasad 64239f1408 Merge pull request #950 from aanand/update-pep8 
Update pep8, fix errors and freeze requirements-dev.txt
 2015-02-11 21:33:14 +00:00
Aanand Prasad c39a0b0a2d Update pep8, fix errors and freeze requirements-dev.txt 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-02-11 19:00:13 +00:00
Fred Lifton 8a7b3fb0eb Merge pull request #922 from aanand/tweak-intro 
Tweak intro
 2015-02-09 16:11:21 -08:00
Daniel Nephin 4251f2b732 Merge pull request #911 from ggtools/release_notes 
Add missing cpu_shares option for rel. 1.1.0-rc1
 2015-02-06 10:47:40 -05:00
Fred Lifton 9f4775c554 Revision and edit of Compose install doc 
Fix rc version to latest.

Signed-off-by: Fred Lifton <fred.lifton@docker.com>
 2015-02-05 17:48:06 -08:00
Aanand Prasad 7ff607fb7a Add checklist item for completion script URL to CONTRIBUTING.md 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-02-05 17:37:04 -05:00
Aanand Prasad b25ed59b1c Tweak intro 
We shouldn't yet be recommending production use - for now, let's continue to emphasise the development use case and mention staging/CI.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-02-05 16:17:38 -05:00
Daniel Nephin eabca3d7b7 Merge pull request #907 from apenney/typo 
Fix a small typo.
 2015-02-02 11:02:12 -05:00
Christophe Labouisse 45b8d526ba Add missing cpu_shares option for rel. 1.1.0-rc1 
Signed-off-by: Christophe Labouisse <christophe@labouisse.org>
 2015-02-01 17:03:50 +01:00
Ashley Penney 75247e5a54 Fix a small typo. 2015-01-31 20:00:04 -05:00
Fred Lifton 2cf1fa6c9d Merge pull request #902 from SvenDowideit/iterate-on-freds-index-doc-revisions 
Edit and revision of overview & quick start doc
 2015-01-30 10:57:19 -08:00
Sven Dowideit 3b7ea5c055 resolve most of my comments 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-01-30 21:27:57 +10:00
Fred Lifton 461f1ad5d5 Edit and revision of overview & quick start doc 
Signed-off-by: Fred Lifton <fred.lifton@docker.com>
 2015-01-29 19:55:11 -08:00
Fred Lifton 2307adc4b2 Merge pull request #855 from SvenDowideit/add-docker-docs-metadata-and-reflow-to-80-chars 
Add Docker docs.docker.com meta-data, and reflow to 80-chars to simplify GH diffs
 2015-01-29 19:21:23 -08:00
Sven Dowideit d8d0fd6dc9 Add Docker docs.docker.com meta-data, and reflow to 80-chars to simplify github diffs 
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>
 2015-01-30 13:11:48 +10:00
Aanand Prasad e4d6a2c240 Merge pull request #900 from aanand/ship-1.1.0-rc2 
Ship 1.1.0-rc2
 2015-01-29 18:00:26 -05:00
Aanand Prasad deb2de3c07 Ship 1.1.0-rc2 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-01-29 18:00:10 -05:00
Aanand Prasad bc1f6c97d8 Merge pull request #898 from aanand/support-fig-yml 
Support fig.yml
 2015-01-29 13:47:49 -05:00
Aanand Prasad 7c087f1c07 Support fig.y(a)ml and show a deprecation warning 
Closes #864

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-01-29 13:14:44 -05:00
Ben Firshman fd30920aac Merge pull request #897 from aanand/nicer-env-file-error 
Nicer env file error
 2015-01-29 00:51:05 +00:00
Aanand Prasad 9bc7604e0e Make sure we're testing uppercase directories properly 
(OS X is case-sensitive so we can't have fixture dirs which are
identically named if you ignore case)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-01-28 17:19:27 -05:00
Aanand Prasad de07e0471e Show a nicer error when the env file doesn't exist 
Closes #865

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-01-28 16:20:01 -05:00
Aanand Prasad dfc6206d0d Extract get_env_files() 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-01-28 16:18:02 -05:00
Aanand Prasad 6c45b6ccdb Make sure we're testing blank lines and comments in env files 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-01-28 16:18:02 -05:00