ae3c66baed
Merge pull request #2204 from mnowster/2123-escaping-env-variables
...
Attempt to document escaping env vars
2015-10-16 15:51:58 -04:00
4b939d3560
Merge pull request #2199 from cweagans/1752-docker-compose-pull-service-nodeps
...
docker-compose pull SERVICE should not pull SERVICE's dependencies
2015-10-16 17:12:28 +01:00
a712d828d4
Merge pull request #2200 from aanand/revert-tutorials
...
Revert networking-related changes to getting started guides
2015-10-16 17:06:31 +01:00
7b109bc026
Attempt to document escaping env vars
...
People are likely to run into their env vars being set to empty strings,
if they're not aware that they need to escape them for Compose to not
interpolate them.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-10-16 15:32:02 +01:00
b0c895c5f5
Merge pull request #2193 from mrfuxi/less-verbose-extends-docs
...
Docs for shorthand notation of extends. Issue #1989
2015-10-16 10:25:10 +01:00
1ed23fb2de
Revert networking-related changes to getting started guides
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-10-16 11:58:27 +05:30
53fc6d06f6
docker-compose pull SERVICE should not pull SERVICE's dependencies
...
Signed-off-by: Cameron Eagans <me@cweagans.net>
2015-10-15 17:33:32 -06:00
ccfb6e6fa8
Docs for shorthand notation of extends. Issue #1989
...
Signed-off-by: Karol Duleba <mr.fuxi@gmail.com>
2015-10-15 22:17:13 +01:00
8f840a55de
Merge pull request #2194 from dnephin/update_release_docs
...
Update release docs
2015-10-15 15:40:13 -04:00
4d8b184b14
Merge pull request #2196 from md2perpe/patch-1
...
Remove incorrectly placed comment
2015-10-15 15:31:49 +01:00
971bfd403e
Merge pull request #2195 from timbutler/master
...
Fix link to Release Process doc in README.md
2015-10-15 15:30:00 +01:00
c6ff81fe30
Remove incorrectly placed comment
...
I'm not sure if it should be there at all, but at least it should hardly be where it currently is located.
Signed-off-by: Per Persson <per.persson@exertisztorm.com>
2015-10-15 15:25:52 +02:00
7e59a7ea32
Fix link to Release Process doc in README.md
...
Signed-off-by: Tim Butler <tim.butler.au@gmail.com>
2015-10-15 17:09:57 +10:00
fbe8e76902
Add missing merge for release branch.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-14 15:24:05 -04:00
58e6d4487a
Fix some release docs.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-14 15:16:58 -04:00
338f2f4507
Add a script to generate contributor list.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-14 15:14:04 -04:00
0409b287ad
Merge pull request #2191 from dnephin/networking
...
Networking
2015-10-14 12:31:26 -04:00
6b68a84b9b
Merge pull request #2019 from mrfuxi/less-verbose-extends
...
Allow to extend service using shorthand notation. Closes #1989
2015-10-14 17:13:09 +01:00
e2f792c4f4
If -x-networking is used, set the correct API version.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-14 12:09:50 -04:00
d5f5eb1924
Enable use of Docker networking with the --x-networking flag
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-10-14 11:19:43 -04:00
f228173660
Print docker version.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-14 11:18:21 -04:00
7c6e7e0dce
Update docker-py to 1.5.0
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-14 11:18:21 -04:00
b9c76dfabd
Merge pull request #2181 from mnowster/2128-split-drive-not-handling-relative-paths
...
2128 split drive not handling relative paths
2015-10-14 11:04:42 -04:00
f1e3c7b8b8
Merge pull request #2189 from mnowster/support-for-cgroup_parent
...
Support for cgroup parent
2015-10-14 10:59:04 -04:00
ca36628a0e
Test cgroup_parent option is being sent.
...
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-10-14 15:02:42 +01:00
f4efa29377
Added support for cgroup_parent
...
This change adds cgroup-parent support to compose project. It allows
each service to specify a 'cgroup_parent' option.
Signed-off-by: Mohit Soni <mosoni@paypal.com>
2015-10-14 15:02:42 +01:00
26ff729696
Merge pull request #2164 from dnephin/rename_compose_reference
...
Rename "yml reference" to "Compose file reference"
2015-10-14 14:58:35 +01:00
fbfbe60246
Rename yml.md to compose-file.md and add an alias for the old url.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-14 09:51:34 -04:00
01f44efe0d
Re-arrange volume_driver in compose file reference.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-14 09:50:37 -04:00
e6344f819a
Rename yaml reference to compose file reference.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-14 09:50:37 -04:00
c7ffbf97c8
Extend oneOf error handling. Issue #1989
...
Signed-off-by: Karol Duleba <mr.fuxi@gmail.com>
2015-10-14 14:31:35 +01:00
bc82f065bc
Merge pull request #1994 from charleswhchan/patch-3
...
Touchup "Quickstart Guide: Compose and Django"
2015-10-14 12:46:16 +01:00
5fa5ea0e16
Touchup "Quickstart Guide: Compose and Django"
...
Also incorporated the structural changes by @moxiegirl in PR #1994 as well as subsequent issues reported by @aanand.
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
2015-10-13 20:10:41 -07:00
c06d9ec672
Merge pull request #2179 from moxiegirl/retooling-hugo-15
...
Updating to new tooling:supports Github source linking
2015-10-13 18:12:56 -04:00
e9ee244e5a
Aaaaaaaaaaaargh
...
Signed-off-by: Mary Anthony <mary@docker.com>
2015-10-13 15:06:37 -07:00
0e9c542865
Updating to new tooling:supports Github source linking
...
Fixing HEAD
Updating to match daniel
Fixing the index link
Signed-off-by: Mary Anthony <mary@docker.com>
2015-10-13 14:04:25 -07:00
129092b7b4
Merge pull request #2159 from dnephin/update_pip_install_docs
...
Update pip install instructions to be more reliable
2015-10-13 17:35:59 +01:00
c1d5ecaafe
Workaround splitdrive limitations
...
splitdrive doesn't handle relative paths, so if volume_path contains
a relative path, we handle that differently and manually set drive to ''.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-10-13 17:27:25 +01:00
9aaecf95a4
Update pip install instructions to be more reliable.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-13 12:25:06 -04:00
bc6b3f970b
container paths don't need to be expanded
...
They should not ever be relative.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-10-13 17:03:09 +01:00
4b845746ef
Merge pull request #2154 from dnephin/publish_master_builds
...
Publish master builds to bintray
2015-10-13 14:50:25 +01:00
928300478b
Merge pull request #2162 from dnephin/docs_cleanup_and_fixes
...
Docs changes, fixed some links, removed older links, etc
2015-10-13 14:25:33 +01:00
9b9c8f9cbc
Clarify irc details, and remove "infancy" statement.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-09 11:14:21 -04:00
e90d2b418d
Update title for command-line completion docs.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-09 11:14:21 -04:00
182c2537d0
Fix links between reference sections
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-09 11:14:21 -04:00
cd48a7026a
Cleanup doc reference links.
...
Removed 'Compose command line completion' and 'Compose environment variables' from the list. command line completion is linked to from install docs, and environment variables are deprecated.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-09 11:13:24 -04:00
6e838b5de1
Add link to master builds from install docs.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-09 10:03:44 -04:00
0e9ec8aa74
Add publish to bintray step to appveyor.yml
...
Remove Set-PSDebug -trace to prevent the 9000+ lines of debug output
from spamming the logs on appveyor.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-09 10:02:59 -04:00
94e6727831
Re-order docs Makefile for better caching.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-08 19:12:02 -04:00
5fbde6106e
Merge pull request #2157 from mnowster/2151-missing-port-range
...
Put port ranges back in
2015-10-08 10:22:33 -04:00
Daniel Nephin
mnowster
Mazz Mosley
Aanand Prasad
Cameron Eagans
Karol Duleba
Per Persson
Tim Butler
Daniel Nephin
Mohit Soni
Charles Chan
Mary Anthony