 Vincent Demeester
|
f626fc5ce8
Add support for log-driver in docker-compose.yml
|
10 years ago |
 Daniel Nephin
|
6c95eed781
Merge pull request #1269 from aanand/labels
|
10 years ago |
 Aanand Prasad
|
2e6bc078fb
Implement 'labels' option
|
10 years ago |
|
Daniel Nephin
|
a89bc304f6
Merge pull request #1075 from KyleJamesWalker/master
|
10 years ago |
 CJ
|
86a08c00f2
See https://github.com/docker/compose/pull/1158#discussion_r29063218
|
10 years ago |
 xuxinkun
|
688f82c1cf
Add cpuset config.
|
10 years ago |
|
Daniel Nephin
|
a631c1eddb
Merge pull request #1357 from turtlemonvh/1350-extends_parent_build_directory_dne_error
|
10 years ago |
 Timothy Van Heest
|
855855a0e6
Fix for #1350, nonexisting build path in parent section causes extending section to fail
|
10 years ago |
 Kyle Walker
|
d17c4d27fa
Support alternate Dockerfile name.
|
10 years ago |
 Sam Wing
|
fb81c37ca6
added the extra_hosts option to the yml configuration which exposes the --add-host flag from the docker client
|
10 years ago |
 Ben Firshman
|
4926f8aef6
Merge pull request #1261 from aanand/fix-vars-in-volume-paths
|
10 years ago |
|
Aanand Prasad
|
fd568b389d
Fix home directory and env expansion in volume paths
|
10 years ago |
 Steven Dake
|
94277a3eb0
Add --pid=host support
|
10 years ago |
 Moysés Borges
|
8584525e8d
Interpret 'build:' as relative to the yml file
|
10 years ago |
|
Aanand Prasad
|
907918b492
Merge multi-value options when extending
|
10 years ago |
|
Aanand Prasad
|
2a415ede08
When extending, `build` replaces `image` and vice versa
|
10 years ago |
 akoskaaa
|
f9ea5ecf40
[pep8] make test files and config files pep8 valid
|
10 years ago |
|
Aanand Prasad
|
35c6e0314c
Fix volume merging when there's no explicit host path
|
10 years ago |
|
Aanand Prasad
|
276e43ca6b
Fix service dict merging when only one dict has a volumes key
|
10 years ago |
|
Aanand Prasad
|
965426e39b
Revert "Add 'labels:' config option"
|
10 years ago |
|
Aanand Prasad
|
721327110d
Add 'labels:' config option
|
10 years ago |
|
Aanand Prasad
|
37efdb1f8b
Make volume host paths relative to file, merge volumes when extending
|
10 years ago |
|
Aanand Prasad
|
4c582e4352
Implement `extends`
|
10 years ago |
|
Aanand Prasad
|
528bed9ef6
Fix environment resolution
|
10 years ago |
|
Aanand Prasad
|
4ecf5e01ff
Extract YAML loading and parsing into config module
|
10 years ago |
