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

969 Commits

Author SHA1 Message Date
Aanand Prasad 30b7c22c71 Merge pull request #1043 from alunduil/add-bashcomp-to-sdist 
add bash completion to sdist
 2015-03-02 12:05:09 +00:00
Aanand Prasad f89f9e3190 Merge pull request #1007 from KingsleyKelly/force 
Add -f flag as option on rm.
 2015-03-02 11:26:28 +00:00
Alex Brandt 0e30d0085b add bash completion to sdist 
When installing from the source distribution (for packaging or other
purposes), it's convenient to be able to install the bash completion
file as part of that process.
 2015-02-28 15:18:29 -06:00
KingsleyKelly fa195bc829 Add -f flag as option on rm. 
Signed-off-by: Kingsley Kelly <kingsley.kelly@gmail.com>
 2015-02-27 07:24:43 +00:00
Ben Firshman 44f5a3ea46 Merge pull request #1028 from aanand/update-readme 
Update README with new docs URL and IRC channel
 2015-02-26 14:11:37 +00:00
Ben Firshman 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
Ben Firshman 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
Ben Firshman 03535a6158 Merge pull request #1027 from aanand/ship-1.1.0 
Ship 1.1.0
 2015-02-25 18:42:28 +00:00
Aanand Prasad c41342501b Update README with new docs URL and IRC channel 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-02-25 18:25:15 +00:00
Aanand Prasad 4ac02bfca6 Ship 1.1.0 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-02-25 18:16:44 +00:00
Aanand Prasad 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
Aanand Prasad 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
Ben Firshman a0db5bee3e Merge pull request #1022 from aanand/previously-known-as 
Add 'previously known as Fig' note to README.md
 2015-02-25 17:52:04 +00:00
Ben Firshman 59c45e3398 Merge pull request #1026 from aanand/fix-requests-version-range 
Fix requests version range
 2015-02-25 17:51:39 +00:00
Aanand Prasad ea8364fd11 Add 'previously known as Fig' note to README.md 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-02-25 17:39:12 +00:00
Aanand Prasad cf6b09e94b Fix requests version range 
It was more permissive than docker-py's, resulting in an incompatible
version (2.5.x) being installed.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-02-25 17:34:22 +00:00
Ben Firshman 66555aa69b Merge pull request #1021 from aanand/update-urls 
Update URLs in documentation
 2015-02-25 16:48:28 +00:00
Aanand Prasad bb943d5cb5 Update URLs in documentation 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-02-25 14:58:03 +00:00
Ben Firshman 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
Ben Firshman 32cdabefc2 Merge pull request #1016 from SvenDowideit/docs-tweak 
Add an index to the bottom of the Compose docs as they're scattered arou...
 2015-02-25 13:55:47 +00:00
Sven Dowideit 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
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
Aanand Prasad 34c6920b37 Point at official Docker install instructions rather than repeating them 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-02-24 11:43:14 +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