diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-05-08 21:12:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-08 21:12:19 +0200 |
| commit | 49e09ddbf5a17eab025f661d4f57e5868181d57a (patch) | |
| tree | f3fde54b86541bb67d5c3ef5d3ba4dba0c831676 /pkg/varlinkapi | |
| parent | 7b54ebb48fecb4205304586a57a3e6b9b96befa0 (diff) | |
| parent | 38199f4c28712912ea857bf9938dc8ea3798ca61 (diff) | |
| download | podman-49e09ddbf5a17eab025f661d4f57e5868181d57a.tar.gz podman-49e09ddbf5a17eab025f661d4f57e5868181d57a.tar.bz2 podman-49e09ddbf5a17eab025f661d4f57e5868181d57a.zip | |
Merge pull request #3042 from baude/bridge
add varlink bridge
Diffstat (limited to 'pkg/varlinkapi')
| -rw-r--r-- | pkg/varlinkapi/attach.go | 1 | ||||
| -rw-r--r-- | pkg/varlinkapi/system.go | 17 |
2 files changed, 11 insertions, 7 deletions
diff --git a/pkg/varlinkapi/attach.go b/pkg/varlinkapi/attach.go index 6c62d3514..2234899a5 100644 --- a/pkg/varlinkapi/attach.go +++ b/pkg/varlinkapi/attach.go @@ -60,6 +60,7 @@ 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) reader, writer, _, pw, streams := setupStreams(call) go func() { diff --git a/pkg/varlinkapi/system.go b/pkg/varlinkapi/system.go index 7f436a954..59bfec75b 100644 --- a/pkg/varlinkapi/system.go +++ b/pkg/varlinkapi/system.go @@ -86,15 +86,18 @@ func (i *LibpodAPI) GetInfo(call iopodman.VarlinkCall) error { Graph_status: graphStatus, } - registriesInterface := info[2].Data["registries"] - insecureRegistriesInterface := info[3].Data["registries"] - if registriesInterface != nil { - registries = registriesInterface.([]string) + if len(info) > 2 { + registriesInterface := info[2].Data["registries"] + if registriesInterface != nil { + registries = registriesInterface.([]string) + } } - if insecureRegistriesInterface != nil { - insecureRegistries = insecureRegistriesInterface.([]string) + if len(info) > 3 { + insecureRegistriesInterface := info[3].Data["registries"] + if insecureRegistriesInterface != nil { + insecureRegistries = insecureRegistriesInterface.([]string) + } } - podmanInfo.Store = infoStore podmanInfo.Podman = pmaninfo podmanInfo.Registries = registries |