Merge remote-tracking branch 'upstream/1.0'

This commit is contained in:
Paul Bellamy committed 2015-06-22 17:28:50 +01:00
commit acd5b91eb8
2 files changed
+14 -2

No files matched your search

+4 -1
View File
@@ -89,7 +89,10 @@ func (i *createContainerInterceptor) setWeaveWaitEntrypoint(container *docker.Co
}
}
container.Entrypoint = append(weaveWaitEntrypoint, container.Entrypoint...)
if len(container.Entrypoint) == 0 || container.Entrypoint[0] != weaveWaitEntrypoint[0] {
container.Entrypoint = append(weaveWaitEntrypoint, container.Entrypoint...)
}
return nil
}