19ae76a442
Update docker-py and dockerpty
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-02-04 19:41:11 +00:00
c2db1a24bf
Merge pull request #2822 from aanand/update-docker-py-and-dockerpty
...
Update docker-py and dockerpty
2016-02-04 19:40:41 +00:00
be236d8801
Update docker-py and dockerpty
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-02-04 19:16:01 +00:00
a55210413c
Update docs for version being a string.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-04 17:21:15 +00:00
93426cec4c
Merge pull request #2824 from dnephin/docs_version_is_a_string
...
Update docs for version being a string
2016-02-04 17:20:32 +00:00
a7c2987991
Update docs for version being a string.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-04 12:19:43 -05:00
6caa188730
Fix example formatting for depends_on.
...
Markdown was acting against expectations here by merging the example indented YAML into the previous list item instead of treating it as a code block.
I decided that a better way of handling this would be to add a "Simple example:" line that is also used elsewhere in this file. It resets the markdown indentation in a way that works.
Signed-off-by: Spencer Rinehart <anubis@overthemonkey.com>
2016-02-04 15:57:29 +00:00
386974f831
Merge pull request #2814 from nubs/patch-1
...
Fix example formatting for depends_on.
2016-02-04 15:56:27 +00:00
413a55aa71
Connect container to networks before starting it
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-02-04 14:43:11 +00:00
80d02e84e2
Merge pull request #2808 from aanand/connect-before-start
...
Connect container to networks before starting it
2016-02-03 23:49:56 -05:00
bdddbe3a73
Improve names in Compose file 2 example
...
Just makes it a bit clearer what's going on.
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-02-03 17:42:57 -08:00
f612bc98d9
Fix example formatting for depends_on.
...
Markdown was acting against expectations here by merging the example indented YAML into the previous list item instead of treating it as a code block.
I decided that a better way of handling this would be to add a "Simple example:" line that is also used elsewhere in this file. It resets the markdown indentation in a way that works.
Signed-off-by: Spencer Rinehart <anubis@overthemonkey.com>
2016-02-03 14:36:46 -06:00
64336615cf
Falling back to default project name when COMPOSE_PROJECT_NAME is set to empty
...
Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com>
2016-02-03 18:21:44 +00:00
a59982eb11
Fixing duplicate identifiers
...
Signed-off-by: Mary Anthony <mary@docker.com>
2016-02-03 18:21:44 +00:00
46f33f12b0
Update merge docs with depends_on, and correction about how links and volumes_from are merged.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-03 18:21:44 +00:00
dc718eae65
Make links unique-by-alias when merging
...
Factor out MergeDict from merge_service_dicts to reduce complexity below limit.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-03 18:21:44 +00:00
aa5ff05463
Fix merging of lists with multiple files.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-03 18:21:44 +00:00
3b7471ae84
Add depends_on to ALLOWED_KEYS
...
This ensures and already existing `depends_on` is not deleted when the service on which it is defined also employs `extends`.
Signed-off-by: Ryan Taylor Long <ryan@rtlong.com>
2016-02-03 18:21:44 +00:00
7f009aeeb9
Move command reference to overview.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-03 18:21:44 +00:00
44c7d080bd
Rename the old environment variable page to link environment variables.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-03 18:21:43 +00:00
32bd760526
Cleanup command-line reference docs by renaming overview to envvars.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-03 18:21:43 +00:00
009dbbe971
Use the same capitalization for all menu items in the docs.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-03 18:21:43 +00:00
6b59ba0c31
Re-order compose docs so that quickstart guides come before other documentation.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-03 18:21:43 +00:00
61d00ebee4
Extract volume init and removal from project.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-03 18:21:43 +00:00
3b1276bd44
Include networks in the config_hash.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-03 18:21:43 +00:00
3e8a4a5dc3
Don't initialize networks that aren't used by any services.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-03 18:21:43 +00:00
0c87e0b18f
Refactor project network initlization.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-03 18:21:43 +00:00
8024f2f09e
Tweak and test warning shown when version is a dict
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-02-03 18:21:43 +00:00
f081376067
Improve error messages for invalid versions
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-02-03 18:21:42 +00:00
ce0d469c18
Make 'version' a string
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-02-03 18:21:42 +00:00
b2ee08f439
Remove redundant check - self.config should never be None
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-02-03 18:21:42 +00:00
e9ba06ed4b
Normalise/fix config field designators in validation messages
...
- Instead of "Service 'web' configuration key 'image'", just say
"web.image"
- Fix the "Service 'services'" bug in the v2 file format
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-02-03 18:21:42 +00:00
9e9b36460c
Convert validation error tests to pytest style
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-02-03 18:21:42 +00:00
89c5b800e6
Merge pull request #2782 from dbonev/2772-compose-project-name-empty
...
Falling back to default project name on empty COMPOSE_PROJECT_NAME
2016-02-02 20:37:38 -05:00
bd1c8973ab
Merge pull request #2809 from moxiegirl/fixing-dup-identifier
...
Fixing duplicate identifiers for 1.10
2016-02-02 15:43:09 -08:00
a713447e0b
Fixing duplicate identifiers
...
Signed-off-by: Mary Anthony <mary@docker.com>
2016-02-02 12:04:13 -08:00
2651c00f0c
Connect container to networks before starting it
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-02-02 19:31:49 +00:00
4c4e94bc19
Merge pull request #2785 from dnephin/depends_on_with_extends
...
Fix list options when used with extends and multiple files
2016-02-02 13:36:46 -05:00
1cb67b781c
Merge pull request #2777 from dnephin/reorder_docs
...
Re-order docs in menu, fix menu title capitalization, cleanup command reference
2016-02-02 11:26:26 -05:00
c290e560cb
Merge pull request #2786 from dnephin/refactor_project
...
Fix a few bugs around networking and project initilization
2016-02-02 11:19:34 -05:00
7a197e5a69
Merge pull request #2802 from dnephin/appveyor_to_bintray_deploy
...
Deploying to bintray from appveyor using the new bintray support
2016-02-02 16:13:07 +00:00
c81cc24e72
Merge pull request #2806 from aanand/run-tests-with-tty
...
Run test containers in TTY mode
2016-02-02 10:56:21 -05:00
3d3388d59b
Extract volume init and removal from project.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-02 10:53:04 -05:00
e551988616
Include networks in the config_hash.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-02 10:52:03 -05:00
0810eeba10
Don't initialize networks that aren't used by any services.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-02 10:52:03 -05:00
8e838968fe
Refactor project network initlization.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-02 10:51:31 -05:00
3ec87adccc
Update merge docs with depends_on, and correction about how links and volumes_from are merged.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-02 10:49:43 -05:00
e32863f89e
Make links unique-by-alias when merging
...
Factor out MergeDict from merge_service_dicts to reduce complexity below limit.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-02 10:48:47 -05:00
bf6a5d3e49
Fix merging of lists with multiple files.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-02 10:48:18 -05:00
c70c72f49a
Add depends_on to ALLOWED_KEYS
...
This ensures and already existing `depends_on` is not deleted when the service on which it is defined also employs `extends`.
Signed-off-by: Ryan Taylor Long <ryan@rtlong.com>
2016-02-02 10:48:18 -05:00
Aanand Prasad
Daniel Nephin
Spencer Rinehart
Daniel Nephin
Ben Firshman
Dimitar Bonev
Mary Anthony
Ryan Taylor Long
Sven Dowideit