ae96fc0071
Support reading config from stdin.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-07-02 22:16:22 -04:00
58f3b576c9
Replace - with _ in completion identifiers.
...
Signed-off-by: Ben Hamill <git-commits@benhamill.com>
2015-07-02 14:20:53 -05:00
8709dc3c24
Added env var parsing to volume container paths
...
This commit adds environment variable parsing to the container side
of the volume mapping in configs. The common use case for this is
mounting SSH agent sockets in a container, using code like:
volumes:
- $SSH_AUTH_SOCK:$SSH_AUTH_SOCK
environment:
- SSH_AUTH_SOCK
Signed-off-by: Jeff Kramer <jeff.kramer@voxmedia.com>
2015-07-02 13:13:38 -05:00
a8ea82f78f
Improve link caption
...
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-07-02 15:39:22 +01:00
cd2cdb25e3
Merge pull request #1631 from aanand/add-mazz-to-maintainers
...
Add Mazz to MAINTAINERS
2015-07-02 14:20:39 +01:00
5185c9f70a
Merge pull request #1619 from AndyWendt/patch-1
...
Added uninstall documentation for pip and curl
2015-07-02 06:07:59 -07:00
f0dd63d5bc
Don't use future tense
...
As per style-guide, future tense is not necessary.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-07-01 18:06:09 +01:00
9549bd0539
Initial cap Docker
...
Use lowercase docker only when referencing a command/daemon
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-07-01 18:05:21 +01:00
f33f673b49
Allow _.- chars in service names
...
As VALID_CHARS is shared with project names, these chars are also
now allowed within project names.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-07-01 17:57:50 +01:00
8cf84ea552
Fix missing image names
...
These tests were indeed raising a config error, but not for the reason
intended/tested for. I've added in the image name so the config error
raise is correctly testing the Service name.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-07-01 17:57:50 +01:00
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
ab03f2310b
Include zsh shell
...
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-07-01 16:20:29 +01:00
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
098ec3dcaa
Add in `git fork` syncing links
...
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-07-01 15:58:11 +01:00
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
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
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
4c31741ac9
Include command completion link
...
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-07-01 15:58:10 +01:00
a7a0888446
Re-phrasing for clarity
...
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-07-01 15:58:10 +01:00
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
3906bd067e
Remove redundant import
...
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-07-01 15:58:10 +01:00
63941b8f6c
Add Mazz to MAINTAINERS
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-01 15:38:07 +01:00
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
8197d0e261
Added uninstall documentation for pip and curl
...
Signed-off-by: Andy Wendt <andy@awendt.com>
2015-06-30 10:27:44 -06:00
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
8346186469
Merge pull request #1603 from albers/completion-help-option
...
Add --help to bash completion
2015-06-25 17:59:06 -07:00
9a8020d1bf
Add --help to bash completion
...
Signed-off-by: Harald Albers <github@albersweb.de>
2015-06-25 14:04:03 -07:00
bee65e8354
Merge pull request #1587 from aanand/fix-detached-description
...
Fix -d description
2015-06-23 08:36:02 -07:00
104568b27b
Merge branch 'compose-swarm-networking-guide'
2015-06-22 08:44:52 -07:00
52975eca6f
Fixes
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-06-22 08:44:41 -07:00
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
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
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
4f83a18912
Merge pull request #1570 from aanand/fix-build-pull
...
Explicitly set pull=False when building
2015-06-21 17:25:46 -07:00
52c19bf96c
Fix -d description
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-06-21 13:06:25 -07:00
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
511fc4a05c
Replace backtick code blocks with indentation
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-06-21 12:37:20 -07:00
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
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
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
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
efee2df310
Merge pull request #1572 from sdurrheimer/fix-completion-docs-urls
...
Fix completion docs URLs
2015-06-19 11:42:39 -07:00
d0102f0761
Fix completion docs URLs
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2015-06-19 17:57:18 +02:00
c3df62472b
Updating from three ticks to code block
...
Signed-off-by: Mary Anthony <mary@docker.com>
2015-06-19 02:28:09 -07:00
bef0926c58
Explicitly set pull=False when building
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-06-18 17:43:16 -07:00
c7c88bb4ff
Merge pull request #1566 from aanand/bump-1.4.0dev
...
Bump 1.4.0dev
2015-06-18 19:57:53 -04:00
5aa82a5519
Bump 1.4.0dev
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-06-18 11:56:43 -07:00
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
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
ae96e1af16
Use Docker 1.7.0
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-06-18 10:34:34 -07:00
Daniel Nephin
Ben Hamill
Jeff Kramer
Mazz Mosley
Mazz Mosley
moxiegirl
Aanand Prasad
Andy Wendt
Steve Durrheimer
Harald Albers
Ben Firshman