 Patrick Chanezon
|
98dd0cd1f8
implemented @aanand comments
|
11 years ago |
|
Patrick Chanezon
|
c441ac90d6
paulczar fixes plus example file
|
11 years ago |
 Aanand Prasad
|
9d7b54d8fd
Merge pull request #1183 from pborreli/patch-2
|
11 years ago |
 Pascal Borreli
|
59f04c6e29
Fixed typo
|
11 years ago |
|
Aanand Prasad
|
367ae0c848
Merge pull request #1185 from akoskaaa/master
|
11 years ago |
 akoskaaa
|
4e0f555c58
make flake8 a bit more specific
|
11 years ago |
 Ben Firshman
|
baf18decae
Merge pull request #1179 from aanand/test-1.6-rc
|
11 years ago |
|
akoskaaa
|
fa2fb6bd38
[pep8] flake8 run for everything, fix items from this change
|
11 years ago |
|
akoskaaa
|
f9ea5ecf40
[pep8] make test files and config files pep8 valid
|
11 years ago |
|
Aanand Prasad
|
99f7eba930
Add Docker 1.6 RC2 to tested versions
|
11 years ago |
|
Ben Firshman
|
9aab7bc242
Merge pull request #1172 from aanand/fix-dns
|
11 years ago |
|
Aanand Prasad
|
83dcceacaf
Fix regression in Dns and DnsSearch settings
|
11 years ago |
|
Aanand Prasad
|
1f06070f12
Merge pull request #1160 from aanand/fix-volume-merging
|
11 years ago |
|
Aanand Prasad
|
35c6e0314c
Fix volume merging when there's no explicit host path
|
11 years ago |
|
Aanand Prasad
|
276e43ca6b
Fix service dict merging when only one dict has a volumes key
|
11 years ago |
|
Aanand Prasad
|
b7046777d1
Merge pull request #1161 from aanand/revert-labels-and-dependencies
|
11 years ago |
|
Aanand Prasad
|
1c14fc06da
Update docker-py and requests version ranges
|
11 years ago |
|
Aanand Prasad
|
f4ef2c09d6
Revert "Remove restriction for requests version, update docker-py requirement"
|
11 years ago |
|
Aanand Prasad
|
16495c577b
Revert "Use dev version of Docker"
|
11 years ago |
|
Aanand Prasad
|
965426e39b
Revert "Add 'labels:' config option"
|
11 years ago |
|
Aanand Prasad
|
02f119e4b7
Merge pull request #1145 from aanand/labels
|
11 years ago |
|
Aanand Prasad
|
721327110d
Add 'labels:' config option
|
11 years ago |
|
Aanand Prasad
|
d209ded13c
Use dev version of Docker
|
11 years ago |
|
Aanand Prasad
|
49c2080bcd
Merge pull request #1088 from aanand/extends
|
11 years ago |
|
Aanand Prasad
|
37efdb1f8b
Make volume host paths relative to file, merge volumes when extending
|
11 years ago |
|
Aanand Prasad
|
4c582e4352
Implement `extends`
|
11 years ago |
|
Aanand Prasad
|
5dca6c232e
Merge pull request #972 from aanand/set-host-config-at-create-time
|
11 years ago |
|
Aanand Prasad
|
eef4bc3917
Specify all HostConfig at create time
|
11 years ago |
|
Ben Firshman
|
9931cd2c4c
Merge pull request #1140 from jfrazelle/add-to-readme
|
11 years ago |
 Jessica Frazelle
|
0226675766
Add build status \o/
|
11 years ago |
