"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "components/engine/vendor/github.com/containerd/containerd/runtime/v1/linux/proc/io.go" between
docker-ce-19.03.2.tar.gz and docker-ce-19.03.3.tar.gz

About: Docker CE is a project to pack, ship and run any application as a lightweight container. Docker containers can run anywhere, on a laptop or at scale, in production, on VMs, bare metal, OpenStack clusters, public clouds and more. Community edition.

io.go  (docker-ce-19.03.2):io.go  (docker-ce-19.03.3)
skipping to change at line 274 skipping to change at line 274
} }
} }
ctx, cancel := context.WithCancel(ctx) ctx, cancel := context.WithCancel(ctx)
cmd := exec.CommandContext(ctx, uri.Host, args...) cmd := exec.CommandContext(ctx, uri.Host, args...)
cmd.Env = append(cmd.Env, cmd.Env = append(cmd.Env,
"CONTAINER_ID="+id, "CONTAINER_ID="+id,
"CONTAINER_NAMESPACE="+ns, "CONTAINER_NAMESPACE="+ns,
) )
out, err := newPipe() out, err := newPipe()
if err != nil { if err != nil {
cancel()
return nil, err return nil, err
} }
serr, err := newPipe() serr, err := newPipe()
if err != nil { if err != nil {
cancel()
return nil, err return nil, err
} }
r, w, err := os.Pipe() r, w, err := os.Pipe()
if err != nil { if err != nil {
cancel()
return nil, err return nil, err
} }
cmd.ExtraFiles = append(cmd.ExtraFiles, out.r, serr.r, w) cmd.ExtraFiles = append(cmd.ExtraFiles, out.r, serr.r, w)
// don't need to register this with the reaper or wait when // don't need to register this with the reaper or wait when
// running inside a shim // running inside a shim
if err := cmd.Start(); err != nil { if err := cmd.Start(); err != nil {
cancel()
return nil, err return nil, err
} }
// close our side of the pipe after start // close our side of the pipe after start
w.Close() if err := w.Close(); err != nil {
cancel()
return nil, err
}
// wait for the logging binary to be ready // wait for the logging binary to be ready
b := make([]byte, 1) b := make([]byte, 1)
if _, err := r.Read(b); err != nil && err != io.EOF { if _, err := r.Read(b); err != nil && err != io.EOF {
cancel()
return nil, err return nil, err
} }
return &binaryIO{ return &binaryIO{
cmd: cmd, cmd: cmd,
cancel: cancel, cancel: cancel,
out: out, out: out,
err: serr, err: serr,
}, nil }, nil
} }
 End of changes. 6 change blocks. 
1 lines changed or deleted 9 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)