Merge branch '1.0'

This commit is contained in:
Matthias Radestock committed 2015-07-21 11:42:49 +01:00
commit 3c107d675a
2 files changed
+4 -1

No files matched your search

+1 -1
View File
@@ -55,7 +55,7 @@ func (i *createContainerInterceptor) InterceptRequest(r *http.Request) error {
if container.HostConfig == nil {
container.HostConfig = &docker.HostConfig{}
}
container.HostConfig.VolumesFrom = append(container.HostConfig.VolumesFrom, "weaveproxy")
container.HostConfig.VolumesFrom = append(container.HostConfig.VolumesFrom, "weaveproxy:ro")
if container.Config == nil {
container.Config = &docker.Config{}
}