Add cimfs differ and snapshotter
Details about CimFs project are discussed in #8346 Signed-off-by: Amit Barve <ambarve@microsoft.com>
This commit is contained in:
6
vendor/github.com/Microsoft/hcsshim/pkg/go-runhcs/runhcs_exec.go
generated
vendored
6
vendor/github.com/Microsoft/hcsshim/pkg/go-runhcs/runhcs_exec.go
generated
vendored
@@ -51,7 +51,7 @@ func (opt *ExecOpts) args() ([]string, error) {
|
||||
|
||||
// Exec executes an additional process inside the container based on the
|
||||
// oci.Process spec found at processFile.
|
||||
func (r *Runhcs) Exec(context context.Context, id, processFile string, opts *ExecOpts) error {
|
||||
func (r *Runhcs) Exec(ctx context.Context, id, processFile string, opts *ExecOpts) error {
|
||||
args := []string{"exec", "--process", processFile}
|
||||
if opts != nil {
|
||||
oargs, err := opts.args()
|
||||
@@ -60,14 +60,14 @@ func (r *Runhcs) Exec(context context.Context, id, processFile string, opts *Exe
|
||||
}
|
||||
args = append(args, oargs...)
|
||||
}
|
||||
cmd := r.command(context, append(args, id)...)
|
||||
cmd := r.command(ctx, append(args, id)...)
|
||||
if opts != nil && opts.IO != nil {
|
||||
opts.Set(cmd)
|
||||
}
|
||||
if cmd.Stdout == nil && cmd.Stderr == nil {
|
||||
data, err := cmdOutput(cmd, true)
|
||||
if err != nil {
|
||||
return fmt.Errorf("%s: %s", err, data)
|
||||
return fmt.Errorf("%s: %s", err, data) //nolint:errorlint // legacy code
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user