codingworkshop/act
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge nektos/act/v0.2.51

Browse Source
This commit is contained in:
techknowlogick
2023-09-24 15:09:26 -04:00
parent 22d91e3ac3 c241ecda31
commit 4699c3b689
1516 changed files with 463292 additions and 471 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/container/docker_run.go
View File

@@ -385,7 +385,7 @@ func (cr *containerReference) mergeContainerConfigs(ctx context.Context, config
copts.privileged = false
}
containerConfig, err := parse(flags, copts, "")
containerConfig, err := parse(flags, copts, runtime.GOOS)
if err != nil {
return nil, nil, fmt.Errorf("Cannot process container options: '%s': '%w'", input.Options, err)
}
@@ -706,6 +706,14 @@ func (cr *containerReference) waitForCommand(ctx context.Context, isTerminal boo
}
}
func (cr *containerReference) CopyTarStream(ctx context.Context, destPath string, tarStream io.Reader) error {
err := cr.cli.CopyToContainer(ctx, cr.id, destPath, tarStream, types.CopyToContainerOptions{})
if err != nil {
return fmt.Errorf("failed to copy content to container: %w", err)
}
return nil
}
func (cr *containerReference) copyDir(dstPath string, srcPath string, useGitIgnore bool) common.Executor {
return func(ctx context.Context) error {
logger := common.Logger(ctx)