 Ben Firshman
|
a467a8a094
Merge pull request #1261 from aanand/fix-vars-in-volume-paths
|
10 years ago |
 Aanand Prasad
|
78227c3c06
Merge pull request #1202 from aanand/jenkins-script
|
10 years ago |
 Daniel Nephin
|
e4e802d1f8
Merge pull request #1213 from moysesb/relative_build
|
10 years ago |
|
Aanand Prasad
|
b24a60ba9f
Merge pull request #1226 from aanand/merge-multi-value-options
|
10 years ago |
|
Aanand Prasad
|
461b600068
Merge pull request #1225 from aanand/fix-1222
|
10 years ago |
|
Ben Firshman
|
9aab7bc242
Merge pull request #1172 from aanand/fix-dns
|
10 years ago |
|
Aanand Prasad
|
83dcceacaf
Fix regression in Dns and DnsSearch settings
|
10 years ago |
|
Aanand Prasad
|
1f06070f12
Merge pull request #1160 from aanand/fix-volume-merging
|
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
|
b7046777d1
Merge pull request #1161 from aanand/revert-labels-and-dependencies
|
10 years ago |
|
Aanand Prasad
|
1c14fc06da
Update docker-py and requests version ranges
|
10 years ago |
|
Aanand Prasad
|
f4ef2c09d6
Revert "Remove restriction for requests version, update docker-py requirement"
|
10 years ago |
|
Aanand Prasad
|
16495c577b
Revert "Use dev version of Docker"
|
10 years ago |
|
Aanand Prasad
|
965426e39b
Revert "Add 'labels:' config option"
|
10 years ago |
|
Aanand Prasad
|
02f119e4b7
Merge pull request #1145 from aanand/labels
|
10 years ago |
|
Aanand Prasad
|
721327110d
Add 'labels:' config option
|
10 years ago |
|
Aanand Prasad
|
d209ded13c
Use dev version of Docker
|
10 years ago |
|
Aanand Prasad
|
49c2080bcd
Merge pull request #1088 from aanand/extends
|
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
|
5dca6c232e
Merge pull request #972 from aanand/set-host-config-at-create-time
|
10 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
|
10 years ago |
 Jessica Frazelle
|
0226675766
Add build status \o/
|
10 years ago |
|
Ben Firshman
|
ae9c965823
Merge pull request #1128 from aanand/jenkins-dco
|
10 years ago |
|
Daniel Nephin
|
d7a90092c2
Merge pull request #1118 from funkyfuture/issue-1082
|
10 years ago |
|
Aanand Prasad
|
85fb8956f3
Validate DCO in script/test-versions
|
10 years ago |
|
Ben Firshman
|
1e5b9dc2eb
Merge pull request #1005 from aanand/docker-in-docker
|
10 years ago |
|
Ben Firshman
|
d21b8f1ba3
Merge pull request #1112 from bfirsh/remove-wercker-from-readme
|
10 years ago |
