8000 Fix unexpected EOF with Docker 1.10-rc1 and proxy --rewrite-inspect by awh · Pull Request #1917 · weaveworks/weave · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content
This repository was archived by the owner on Jun 20, 2024. It is now read-only.

Fix unexpected EOF with Docker 1.10-rc1 and proxy --rewrite-inspect #1917

Merged
merged 2 commits into from
Jan 21, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions proxy/inspect_exec_interceptor.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ func (i *inspectExecInterceptor) InterceptResponse(r *http.Response) error {
return err
}

if _, ok := exec["Container"]; !ok {
return nil
}

container, err := exec.Object("Container")
if err != nil {
return err
Expand Down
2 changes: 1 addition & 1 deletion weave
Original file line number Diff line number Diff line change
Expand Up @@ -1476,7 +1476,7 @@ proxy_args() {
}

proxy_addrs() {
if addr="$(http_call_unix $PROXY_CONTAINER_NAME status.sock GET /status 2>&1)" ; then
if addr="$(http_call_unix $PROXY_CONTAINER_NAME status.sock GET /status 2>/dev/null)" ; then
echo "$addr" | sed "s/0.0.0.0/$PROXY_HOST/g"

else
Expand Down
0