88b11afde2
Merge pull request #2858 from dnephin/fix_upgrading_url_in_changelog
...
Fix upgrading url in changelog
2016-02-10 15:58:02 +00:00
28689a57a7
Merge pull request #2871 from yograterol/patch-1
...
Typo into the doc with `networks` in yaml
2016-02-10 15:57:45 +00:00
59a2920758
Typo into the doc with `networks` in yaml
...
Signed-off-by: Yohan Graterol <yohangraterol92@gmail.com>
2016-02-09 18:45:04 -05:00
6f06b3bd30
Merge pull request #2853 from dnephin/fix_short_id_alias
...
Use 12 characters for the short id
2016-02-09 14:56:24 -05:00
63870fbccd
Fix upgrading url.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-08 18:15:21 -05:00
859cc2348c
Merge pull request #2744 from aanand/pytest-ini
...
Add pytest.ini
2016-02-08 14:19:40 -05:00
fdf4a2e89e
Merge pull request #2734 from jrabbit/empty-env-var-2359
...
Empty env var #2359
2016-02-08 11:17:54 -08:00
421981e7d2
Use 12 characters for the short id to match docker and fix backwards compatibility.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-08 12:18:48 -05:00
677c50650c
Change special case from '_', None to ()
...
Signed-off-by: jrabbit <jackjrabbit@gmail.com>
2016-02-06 02:54:06 -05:00
8acb5e17e8
Add pytest section to tox.ini
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-02-05 13:07:01 +00:00
28e652daec
Merge pull request #2826 from aanand/bump-1.7.0dev
...
Bump 1.7.0dev
2016-02-04 18:56:27 -05:00
869e815213
Bump 1.7.0dev
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-02-04 23:46:41 +00:00
422ff623b4
Merge pull request #2819 from bfirsh/improve-names-in-compose-file-2-example
...
Improve names in Compose file 2 example
2016-02-04 19:42:22 +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
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
386974f831
Merge pull request #2814 from nubs/patch-1
...
Fix example formatting for depends_on.
2016-02-04 15:56:27 +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
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
7b03de7d01
Move command reference to overview.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-02 10:46:52 -05:00
cf24c36c55
Rename the old environment variable page to link environment variables.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-02 10:46:29 -05:00
2df5593e8f
Cleanup command-line reference docs by renaming overview to envvars.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-02 10:46:28 -05:00
5e30f089e3
Use the same capitalization for all menu items in the docs.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-02 10:46:28 -05:00
4f92004d9a
Re-order compose docs so that quickstart guides come before other documentation.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-02 10:46:28 -05:00
60a5b39f6f
Merge pull request #2783 from aanand/fix-validation-v2
...
Fix validation and version checking
2016-02-02 15:19:50 +00:00
1152c5b25b
Tweak and test warning shown when version is a dict
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-02-02 13:58:34 +00:00
ef8db3650a
Improve error messages for invalid versions
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-02-02 13:58:34 +00:00
aeef61fcd8
Make 'version' a string
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-02-02 13:58:34 +00:00
a8de582425
Remove redundant check - self.config should never be None
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-02-02 13:47:44 +00:00
4ac004059a
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-02 13:47:43 +00:00
d40bc6e4a0
Convert validation error tests to pytest style
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-02-02 13:47:43 +00:00
Aanand Prasad
Yohan Graterol
Daniel Nephin
Daniel Nephin
Joffrey F
jrabbit
Ben Firshman
Spencer Rinehart
Sven Dowideit
Mary Anthony
Ryan Taylor Long