[proxy] We can only rely on receiving a signal when we are a container
Due to https://github.com/docker/docker/issues/9098, there is no way to signal an exec. Instead we'll have to just poll the interface and hope. Adds `weavewait -s` which is the way to tell weavewait to skip waiting for a signal, which we use on execs
This commit is contained in:
1 parent
89074715bc
commit
e2447721eb
2 files changed
+23
-12
No files matched your search
@@ -34,7 +34,8 @@ func (i *createExecInterceptor) InterceptRequest(r *http.Request) error {
|
||||
|
||||
if cidrs, ok := weaveCIDRsFromConfig(container.Config); ok || i.withIPAM {
|
||||
Info.Printf("Exec in container %s with WEAVE_CIDR \"%s\"", container.ID, strings.Join(cidrs, " "))
|
||||
options.Cmd = append(weaveWaitEntrypoint, options.Cmd...)
|
||||
cmd := append(weaveWaitEntrypoint, "-s")
|
||||
options.Cmd = append(cmd, options.Cmd...)
|
||||
}
|
||||
|
||||
if err := marshalRequestBody(r, options); err != nil {
|
||||
|
||||
Reference in new issue
Block a user