summaryrefslogtreecommitdiff
path: root/pkg/varlinkapi/attach.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-05-31 04:53:29 +0200
committerGitHub <noreply@github.com>2019-05-31 04:53:29 +0200
commit558ce8d1417d3980e4622b3293a2e16ee1e267cb (patch)
tree946c3e52196f598acc111db1875896733e15838d /pkg/varlinkapi/attach.go
parent88b7a221a2303f1b1b6664a07b3aafd7d037307b (diff)
parent90ae7206f3ac989c6bc435c03badadcd25976eef (diff)
downloadpodman-558ce8d1417d3980e4622b3293a2e16ee1e267cb.tar.gz
podman-558ce8d1417d3980e4622b3293a2e16ee1e267cb.tar.bz2
podman-558ce8d1417d3980e4622b3293a2e16ee1e267cb.zip
Merge pull request #3224 from haraldh/varlink_upgrade
Fix for varlink upgrade connections
Diffstat (limited to 'pkg/varlinkapi/attach.go')
-rw-r--r--pkg/varlinkapi/attach.go5
1 files changed, 4 insertions, 1 deletions
diff --git a/pkg/varlinkapi/attach.go b/pkg/varlinkapi/attach.go
index 2234899a5..8051f07be 100644
--- a/pkg/varlinkapi/attach.go
+++ b/pkg/varlinkapi/attach.go
@@ -60,7 +60,10 @@ func (i *LibpodAPI) Attach(call iopodman.VarlinkCall, name string, detachKeys st
if !start && state != libpod.ContainerStateRunning {
return call.ReplyErrorOccurred("container must be running to attach")
}
- call.Reply(nil)
+
+ // ACK the client upgrade request
+ call.ReplyAttach()
+
reader, writer, _, pw, streams := setupStreams(call)
go func() {