 Kyle Walker
|
d17c4d27fa
Support alternate Dockerfile name.
|
11 years ago |
 Daniel Nephin
|
0f70b8638f
Merge pull request #1213 from moysesb/relative_build
|
11 years ago |
 Moysés Borges
|
8584525e8d
Interpret 'build:' as relative to the yml file
|
11 years ago |
 Aanand Prasad
|
e3e2247159
Merge pull request #1231 from aanand/docker-1.6rc2
|
11 years ago |
|
Aanand Prasad
|
0650c4485a
Test against Docker 1.6 RC2 only
|
11 years ago |
|
Aanand Prasad
|
e708f4f59d
Merge pull request #1226 from aanand/merge-multi-value-options
|
11 years ago |
|
Aanand Prasad
|
907918b492
Merge multi-value options when extending
|
11 years ago |
|
Aanand Prasad
|
6dbe321a45
Merge pull request #1225 from aanand/fix-1222
|
11 years ago |
|
Aanand Prasad
|
2a415ede08
When extending, `build` replaces `image` and vice versa
|
11 years ago |
 Ben Firshman
|
43369cda9c
Merge pull request #1221 from aanand/update-swarm-doc
|
11 years ago |
|
Aanand Prasad
|
a2557a3354
Merge pull request #1198 from funkyfuture/reformat-contributing.md
|
11 years ago |
|
Aanand Prasad
|
1a14449fe6
Update Swarm doc
|
11 years ago |
|
Aanand Prasad
|
853ce255ea
Merge pull request #1202 from aanand/jenkins-script
|
11 years ago |
|
Aanand Prasad
|
db852e14e4
Add script/ci
|
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 |
 funkyfuture
|
826b8ca4d3
Reformat CONTRIBUTING.md
|
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 |
