tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-04-07 19:55:07 +02:00
Code Issues Packages Projects Releases Wiki Activity
1,304 Commits 24 Branches 268 Tags
Commit Graph

1304 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mazz Mosley
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
Mazz Mosley
ab03f2310b Include zsh shell 
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-07-01 16:20:29 +01:00
Mazz Mosley
94ecc515d3 Link to docker's contrib workflow 
This will aid people in how to make pull requests for code and docs.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-07-01 16:20:29 +01:00
Mazz Mosley
098ec3dcaa Add in git fork syncing links 
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-07-01 15:58:11 +01:00
Mazz Mosley
4e0f4aa20a Split out release process 
To aid clarity in how to contribute, I've moved the release process
out into it's own RELEASE_PROCESS.md file. The release process info
is only relevant for maintainers who are building new releases of
compose.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-07-01 15:58:11 +01:00
Mazz Mosley
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
Mazz Mosley
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
Mazz Mosley
4c31741ac9 Include command completion link 
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-07-01 15:58:10 +01:00
Mazz Mosley
a7a0888446 Re-phrasing for clarity 
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-07-01 15:58:10 +01:00
Mazz Mosley
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
Mazz Mosley
3906bd067e Remove redundant import 
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-07-01 15:58:10 +01:00
Aanand Prasad
75600e37ad Merge pull request #1605 from sdurrheimer/zsh-help-completion 
Add --help to subcommands in zsh completion
 2015-07-01 12:36:25 +01:00
Steve Durrheimer
745e838673 Add --help to subcommands in zsh completion 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2015-06-26 09:00:47 +02:00
Daniel Nephin
8346186469 Merge pull request #1603 from albers/completion-help-option 
Add --help to bash completion
 2015-06-25 17:59:06 -07:00
Harald Albers
9a8020d1bf Add --help to bash completion 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-06-25 14:04:03 -07:00
Aanand Prasad
bee65e8354 Merge pull request #1587 from aanand/fix-detached-description 
Fix -d description
 2015-06-23 08:36:02 -07:00
Aanand Prasad
104568b27b Merge branch 'compose-swarm-networking-guide' 2015-06-22 08:44:52 -07:00
Aanand Prasad
52975eca6f Fixes 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-22 08:44:41 -07:00
Aanand Prasad
4647875408 Merge pull request #1589 from aanand/compose-swarm-networking-guide 
Add experimental Compose/Swarm/multi-host networking guide
 2015-06-22 07:59:17 -07:00
Aanand Prasad
16213dd493 Add experimental Compose/Swarm/multi-host networking guide 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-22 07:58:08 -07:00
Aanand Prasad
c8751980f9 Merge pull request #1578 from aanand/fix-migrate-help 
Fix 'docker-compose help migrate-to-labels'
 2015-06-21 17:25:52 -07:00
Aanand Prasad
4f83a18912 Merge pull request #1570 from aanand/fix-build-pull 
Explicitly set pull=False when building
 2015-06-21 17:25:46 -07:00
Aanand Prasad
52c19bf96c Fix -d description 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-21 13:06:25 -07:00
Aanand Prasad
81cbf558c3 Merge pull request #1586 from aanand/replace-ticks-with-indent 
Replace backtick code blocks with indentation
 2015-06-21 13:03:19 -07:00
Aanand Prasad
511fc4a05c Replace backtick code blocks with indentation 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-21 12:37:20 -07:00
Ben Firshman
911cd60360 Merge pull request #1580 from aanand/dont-set-network-mode-when-none-is-specified 
Don't set network mode when none is specified
 2015-06-19 16:01:04 -07:00
Aanand Prasad
93372dd665 Fix 'docker-compose help migrate-to-labels' 
- Fix "No such command" error

- Add text from migration section of install docs

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-19 15:43:53 -07:00
Aanand Prasad
c22cc02df5 Don't set network mode when none is specified 
Setting a value overrides the new default network option.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-19 15:22:13 -07:00
Aanand Prasad
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
Aanand Prasad
efee2df310 Merge pull request #1572 from sdurrheimer/fix-completion-docs-urls 
Fix completion docs URLs
 2015-06-19 11:42:39 -07:00
Steve Durrheimer
d0102f0761 Fix completion docs URLs 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2015-06-19 17:57:18 +02:00
Mary Anthony
c3df62472b Updating from three ticks to code block 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-06-19 02:28:09 -07:00
Aanand Prasad
bef0926c58 Explicitly set pull=False when building 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-18 17:43:16 -07:00
Daniel Nephin
c7c88bb4ff Merge pull request #1566 from aanand/bump-1.4.0dev 
Bump 1.4.0dev
 2015-06-18 19:57:53 -04:00
Aanand Prasad
5aa82a5519 Bump 1.4.0dev 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-18 11:56:43 -07:00
Aanand Prasad
8ffeaf2a54 Merge pull request #1565 from aanand/use-docker-1.7.0 
Use docker 1.7.0 and docker-py 1.2.3
 2015-06-18 11:23:40 -07:00
Aanand Prasad
ac56ef3d65 Update docker-py to 1.2.3 final 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-18 11:11:51 -07:00
Aanand Prasad
ae96e1af16 Use Docker 1.7.0 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-18 10:34:34 -07:00
Aanand Prasad
4e73e86d94 Merge pull request #1563 from moxiegirl/hugo-test-fixes 
Hugo final 1.7 Documentation PR -- please read carefully
 2015-06-18 10:20:10 -07:00
Mary Anthony
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
Aanand Prasad
77c939b256 Merge pull request #1142 from calou/master 
Added support of option mac-address
 2015-06-17 14:39:00 -07:00
Sébastien Gruchet
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
Daniel Nephin
26ea27172e Merge pull request #1558 from aanand/use-docker-1.7-rc4 
Use Docker 1.7 RC5
 2015-06-16 22:01:50 -04:00
Aanand Prasad
bc7161b475 Merge pull request #1552 from aanand/add-upgrade-instructions 
Add upgrading instructions to install docs
 2015-06-16 16:26:40 -07:00
Aanand Prasad
e0af1a44ea Use Docker 1.7 RC5 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-16 15:14:48 -07:00
Aanand Prasad
bc14c473c9 Merge pull request #1521 from dano/validate-service-names 
Validate that service names passed to Project.containers aren't bogus.
 2015-06-16 10:45:49 -07:00
Dan O'Reilly
464ab3d727 Add a method specifically for service name validation. 
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
 2015-06-15 23:06:06 -04:00
Daniel Nephin
f3df2a9fec Merge pull request #1551 from aanand/use-docker-1.7-rc3 
Use Docker 1.7 RC3
 2015-06-15 21:33:07 -04:00
Aanand Prasad
5b2a0cc73d Merge pull request #1406 from vdemeester/667-compose-port-scale 
Fixing docker-compose port with scale (#667)
 2015-06-15 10:58:44 -07:00
Aanand Prasad
acd8dce595 Add upgrading instructions to install docs 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-15 10:46:48 -07:00