diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-10-11 20:55:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-11 20:55:37 +0200 |
| commit | 79d05b99cfee2f7841c0568fbe4def4fbc095c5c (patch) | |
| tree | dce255b558c740c7f22b931e6258089c7a525a68 /pkg/varlinkapi/containers.go | |
| parent | cee6478f9e5e5cdbfe3df8f4894e416e4c5926e4 (diff) | |
| parent | b6a7d88397c95a9f3a462274a890b65faafd4d7a (diff) | |
| download | podman-79d05b99cfee2f7841c0568fbe4def4fbc095c5c.tar.gz podman-79d05b99cfee2f7841c0568fbe4def4fbc095c5c.tar.bz2 podman-79d05b99cfee2f7841c0568fbe4def4fbc095c5c.zip | |
Merge pull request #4220 from mheon/null_runtime
Move OCI runtime implementation behind an interface
Diffstat (limited to 'pkg/varlinkapi/containers.go')
| -rw-r--r-- | pkg/varlinkapi/containers.go | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/pkg/varlinkapi/containers.go b/pkg/varlinkapi/containers.go index 79fcef11a..b471ee2cf 100644 --- a/pkg/varlinkapi/containers.go +++ b/pkg/varlinkapi/containers.go @@ -9,6 +9,7 @@ import ( "io" "io/ioutil" "os" + "strings" "sync" "syscall" "time" @@ -563,9 +564,14 @@ func (i *LibpodAPI) GetAttachSockets(call iopodman.VarlinkCall, name string) err } } + sockPath, err := ctr.AttachSocketPath() + if err != nil { + return call.ReplyErrorOccurred(err.Error()) + } + s := iopodman.Sockets{ Container_id: ctr.ID(), - Io_socket: ctr.AttachSocketPath(), + Io_socket: sockPath, Control_socket: ctr.ControlSocketPath(), } return call.ReplyGetAttachSockets(s) @@ -811,9 +817,19 @@ func (i *LibpodAPI) ExecContainer(call iopodman.VarlinkCall, opts iopodman.ExecO // ACK the client upgrade request call.ReplyExecContainer() - envs := []string{} + envs := make(map[string]string) if opts.Env != nil { - envs = *opts.Env + // HACK: The Varlink API uses the old []string format for env, + // storage as "k=v". Split on the = and turn into the new map + // format. + for _, env := range *opts.Env { + splitEnv := strings.SplitN(env, "=", 2) + if len(splitEnv) == 1 { + logrus.Errorf("Got badly-formatted environment variable %q in exec", env) + continue + } + envs[splitEnv[0]] = splitEnv[1] + } } var user string |