tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,384 Commits 25 Branches 263 Tags 66 MiB
Commit Graph

2384 Commits

Author SHA1 Message Date
Daniel Nephin 8e838968fe Refactor project network initlization. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-02 10:51:31 -05:00
Aanand Prasad 60a5b39f6f Merge pull request #2783 from aanand/fix-validation-v2 
Fix validation and version checking
 2016-02-02 15:19:50 +00:00
Aanand Prasad 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
Aanand Prasad ef8db3650a Improve error messages for invalid versions 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-02 13:58:34 +00:00
Aanand Prasad aeef61fcd8 Make 'version' a string 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-02 13:58:34 +00:00
Aanand Prasad 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
Aanand Prasad 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
Aanand Prasad 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
Daniel Nephin 9c6c50c607 Merge pull request #2796 from mustafau/patch-1 
Update link to "Common Use Cases" title
 2016-02-01 11:24:18 -05:00
Aanand Prasad 1816147d57 Merge pull request #2740 from albers/completion-create 
bash completion for `docker-compose create`
 2016-02-01 15:44:07 +00:00
Aanand Prasad c1cb75cc4f Merge pull request #2741 from sdurrheimer/zsh-completion-create-command 
Add zsh completion for 'docker-compose create'
 2016-02-01 15:43:47 +00:00
Aanand Prasad b912b306f1 Merge pull request #2784 from dnephin/signal_race 
Fix race condition with up and setting signal handlers
 2016-02-01 15:15:59 +00:00
Mustafa Ulu 0b7877d82a Update link to "Common Use Cases" title 
It is now under overview.md

Signed-off-by: Mustafa Ulu <mustafau@sabanciuniv.edu>
 2016-02-01 00:17:18 +02:00
Daniel Nephin b4868d0259 Fix race condition with up and setting signal handlers. 
Also print stdout on wait_for_container().

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-29 13:04:04 -05:00
Daniel Nephin 40d69675f3 Merge pull request #2745 from albers/completion-services 
Fix computation of service lists in bash completion
 2016-01-28 16:08:46 -05:00
Daniel Nephin 517d3a581c Merge pull request #2768 from aanand/fix-make-branch 
Fixes to make-branch script
 2016-01-28 15:05:21 -05:00
Daniel Nephin 883e45626f Merge pull request #2706 from dnephin/dont_copy_host_volumes 
Don't copy host volumes on recreate
 2016-01-28 15:02:53 -05:00
Aanand Prasad 12af889e26 Merge pull request #2737 from moxiegirl/new-navigation 
New navigation for 1.10 release
 2016-01-28 12:38:28 +00:00
Mary Anthony 3fc72038c5 New navigation for 1.10 release 
Updating with Joffrey's comments

Signed-off-by: Mary Anthony <mary@docker.com>
 2016-01-27 12:05:56 -08:00
Aanand Prasad 634ae7daa5 Let the user specify any repo as their fork 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-27 15:40:28 +00:00
Aanand Prasad 3547c55523 Default to vim if EDITOR is not set 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-27 15:40:28 +00:00
Aanand Prasad 8c250e220c Merge pull request #2754 from aanand/upgrading-improvements 
Improvements to upgrade guide and script
 2016-01-27 13:48:23 +00:00
Aanand Prasad 888f4b43c9 Merge pull request #2762 from aanand/remove-links-warnings 
Remove outdated warnings about links from docs
 2016-01-27 13:08:15 +00:00
Aanand Prasad d3a1cea170 Remove outdated warnings about links from docs 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-27 02:34:59 +00:00
Aanand Prasad 3aa545eb8e Merge pull request #2755 from aanand/fix-rebase-script 
Fix rebase-bump-commit script
 2016-01-27 02:05:24 +00:00
Aanand Prasad ca81672b82 Merge pull request #2761 from aanand/fix-bridge-plus-host 
Remove ability to join bridge network + user-defined networks
 2016-01-27 01:41:07 +00:00
Aanand Prasad 650b0cec38 Remove ability to join bridge network + user-defined networks 
Containers connected to the bridge network can't have aliases, so it's
simpler to rule that they can *either* be connected to the bridge
network (via `network_mode: bridge`) *or* be connected to user-defined
networks (via `networks` or the default network).

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-27 00:42:09 +00:00
Joffrey F e69ef1c456 Bump docker-py version to latest RC 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-27 00:36:38 +00:00
Aanand Prasad d3d09ceb08 Merge pull request #2756 from aanand/external-links-v2 
Add back external links in v2
 2016-01-27 00:34:17 +00:00
Aanand Prasad cd4cc8b8c6 Merge pull request #2760 from aanand/fix-docs-whitespace 
Fix trailing whitespace in docker-compose.md
 2016-01-26 23:39:59 +00:00
Aanand Prasad b84da7c78b Fix trailing whitespace in docker-compose.md 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-26 23:22:21 +00:00
Aanand Prasad 0ba02b4a18 Add back external links in v2 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-26 18:48:43 +00:00
Aanand Prasad e40a46349f Fix rebase-bump-commit script 
Trim whitespace from wc's output before constructing arguments to `git rebase`

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-26 17:42:44 +00:00
Aanand Prasad bacc2b730e Merge pull request #2748 from schmunk42/master 
fixed documentation about traversing yml files
 2016-01-26 17:20:40 +00:00
Aanand Prasad 7d403d09cf Extract helper methods 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-26 16:08:34 +00:00
Aanand Prasad aa4d43af0b Create declarations for named volumes 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-26 16:07:26 +00:00
Aanand Prasad f86fe11825 Make sure version line is at the top of the file 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-26 15:54:18 +00:00
Aanand Prasad 47b22e90f9 Make warnings a bit more readable 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-26 15:53:25 +00:00
Aanand Prasad 4736b4409a Update for links, external_links, network_mode 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-26 15:53:02 +00:00
Aanand Prasad c39d5a3f06 Add note about named volumes to upgrade guide 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-26 15:51:09 +00:00
Joffrey F 4b84d088e0 Merge pull request #2743 from aanand/network-mode 
Implement network_mode option
 2016-01-25 18:26:35 -08:00
Aanand Prasad ed1b204804 Rename 'net' to 'network mode' in various classes/methods 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-25 23:55:20 +00:00
Aanand Prasad a9c623fdf2 Test that net can be extended 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-25 23:55:20 +00:00
Aanand Prasad e566a4dc1c Implement network_mode in v2 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-25 23:24:55 +00:00
Aanand Prasad a267d8fe3c Merge pull request #2728 from shin-/2709_service_volumes 
Match named volumes in service definitions with declared volumes
 2016-01-25 23:24:09 +00:00
Joffrey F af6b18cad8 Merge pull request #2746 from aanand/alias-containers-by-short-id 
Alias containers by short id
 2016-01-25 13:55:30 -08:00
Tobias Munk 5fe0b57e5c fixed documentation about traversing yml files 
Signed-off-by: Tobias Munk <schmunk@usrbin.de>
 2016-01-25 19:33:39 +01:00
Aanand Prasad 313c584185 Alias containers by short id 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-25 16:14:21 +00:00
Harald Albers 73a0d83075 Fix computation of service list in bash completion 
The previous approach assumed that the service list could be extracted
from a single file. It did not follow extends and overrides.

Signed-off-by: Harald Albers <github@albersweb.de>
 2016-01-25 15:51:58 +01:00
Aanand Prasad 3fff286e1a Merge pull request #2727 from dbonev/2703-strict-validation-of-networks 
Network fields schema validation
 2016-01-25 14:39:54 +00:00