tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-05-08 16:40:12 +02:00
Code Issues Packages Projects Releases Wiki Activity
2,559 Commits 21 Branches 271 Tags
Commit Graph

2559 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Steve Durrheimer
381d58bc66 Add zsh completion for 'docker-compose create' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2016-01-25 10:27:21 +01:00
Harald Albers
7f3a319ecc bash completion for docker-compose create 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-01-25 10:15:14 +01:00
jrabbit
0019037712 Modify service_test.py::ServiceTest::test_resolve_env to reflect new behavior 
Signed-off-by: jrabbit <jackjrabbit@gmail.com>
 2016-01-24 15:25:06 -05:00
jrabbit
7ab9509ce6 Mangle the tests. They pass for better or worse! 
Signed-off-by: jrabbit <jackjrabbit@gmail.com>
 2016-01-23 16:19:17 -05:00
jrabbit
6540efb3d3 If an env var is passthrough but not defined on the host don't set it. 
This doesn't change too much code and keeps the generators.

Signed-off-by: jrabbit <jackjrabbit@gmail.com>
 2016-01-23 15:58:06 -05:00
Joffrey F
139c7f7830 Move named volumes matching to config validation phase 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-22 17:42:24 -08:00
Joffrey F
48377a354f is_named_volume also tests for home paths ~ 
Fix bug with VolumeSpec not being updated
Fix integration test

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-22 16:05:21 -08:00
Dimitar Bonev
3a72edb906 Network fields schema validation 
Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com>
 2016-01-22 16:42:10 +02:00
Aanand Prasad
35788f47ff Merge pull request #2729 from shin-/bump_docker_py 
Use latest docker-py rc
 2016-01-22 11:40:35 +00:00
Aanand Prasad
49c83b16c2 Merge pull request #2726 from aanand/no-logs-on-interactive-run 
Pass logs=False to dockerpty
 2016-01-22 11:37:58 +00:00
Joffrey F
9e67eae311 Match named volumes in service definitions with declared volumes 
Raise ConfigurationError for undeclared named volumes
Test new behavior

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-21 18:10:53 -08:00
Joffrey F
77b435f4fe Use latest docker-py rc 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-21 18:07:14 -08:00
Daniel Nephin
963ec1ceda Merge pull request #2707 from dnephin/add_stop_signal_to_docs 
Add stop signal to the docs
 2016-01-21 18:41:28 -05:00
Aanand Prasad
da2b6329ae Add test for logs=False 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>

Conflicts:
	compose/cli/main.py
 2016-01-21 19:20:50 +00:00
Alf Lervag
6e73fb38ea Fixes #2448 
Signed-off-by: Alf Lervag <alf.lervag@bouvet.no>

Conflicts:
	compose/cli/main.py
	requirements.txt
 2016-01-21 19:19:37 +00:00
Aanand Prasad
8662ce8e21 Merge pull request #2723 from aanand/fix-run-with-networking 
Fix 'run' behaviour with networks
 2016-01-21 19:07:53 +00:00
Aanand Prasad
730c33b28c Merge pull request #2699 from aanand/update-compose-file-docs 
Update Compose file documentation for version 2
 2016-01-21 18:57:16 +00:00
Joffrey F
fec8cc9f80 Update documentation for external param 
Signed-off-by: Joffrey F <joffrey@docker.com>

Conflicts:
	docs/compose-file.md
 2016-01-21 18:51:28 +00:00
Aanand Prasad
59493dd7aa Add links to networks key references 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-21 18:51:28 +00:00
Aanand Prasad
2f41f3aa7e Update documentation for links 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-21 18:51:28 +00:00
Aanand Prasad
9a3378930f Document depends_on 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-21 18:50:44 +00:00
Aanand Prasad
0554c6e6fd Update Compose file documentation for version 2 
- Explain each version in its own section
- Explain how to upgrade from version 1 to 2
- Note which keys are restricted to particular versions
- A few corrections to the docs for version-specific keys

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-21 18:50:44 +00:00
Aanand Prasad
f3e55568d1 Fix interactive run with networking 
Make sure we connect the container to all required networks *after*
starting the container and *before* hijacking the terminal.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-21 18:42:59 +00:00
Aanand Prasad
09dbc7b4cb Stop connecting to all networks on container creation 
This relies on an Engine behaviour which is a bug, not an intentional
feature - we have to connect to networks one at a time

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-21 18:04:50 +00:00
Aanand Prasad
a14906fd35 Fix 'run' behaviour with networks 
- Test that one-off containers join all networks
- Don't set any aliases

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-21 17:28:55 +00:00
Aanand Prasad
1e51b7e88b Merge pull request #2722 from aanand/fix-scale-race-condition 
Fix scale race condition
 2016-01-21 17:08:15 +00:00
Aanand Prasad
013c5ea3f9 Merge pull request #2713 from aanand/links-v2 
Support links in v2 files
 2016-01-21 17:08:05 +00:00
Aanand Prasad
7a4fdfd034 Merge pull request #2712 from jzvelc/fix_v2_service_extend 
Fix `extends` when using v2 config format
 2016-01-21 17:06:21 +00:00
Aanand Prasad
642e71b4c7 Stop and remove containers in parallel when scaling down 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-21 15:28:40 +00:00