Try to bind working dir so deduplication resolves conflict with container-options
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
2023-07-28 22:02:00 +02:00
parent 5de3d0579f
commit 9a8b298ac9

View File

@@ -15,7 +15,6 @@ import (
"github.com/drone-plugins/drone-github-actions/utils" "github.com/drone-plugins/drone-github-actions/utils"
"github.com/pkg/errors" "github.com/pkg/errors"
"time"
"github.com/opencontainers/selinux/go-selinux" "github.com/opencontainers/selinux/go-selinux"
docker "github.com/docker/docker/client" docker "github.com/docker/docker/client"
) )
@@ -108,9 +107,9 @@ func (p Plugin) Exec() error {
} }
cmdArgs = append(cmdArgs, "--container-options", fmt.Sprintf("--volume=%s:%s%s", hostWorkDirPath, guestWorkDirPath, bindModifiers)) cmdArgs = append(cmdArgs, "--container-options", fmt.Sprintf("--volume=%s:%s%s", hostWorkDirPath, guestWorkDirPath, bindModifiers))
} else { }// else {
cmdArgs = append(cmdArgs, "-b") cmdArgs = append(cmdArgs, "-b")
} //}
cmd := exec.Command("act", cmdArgs...) cmd := exec.Command("act", cmdArgs...)
@@ -161,8 +160,6 @@ func getWorkDirPath(p Plugin, ctx context.Context) (string, string, error) {
} }
} }
time.Sleep(86400 * time.Second)
return "", "", errors.New("mount point with working directory not found") return "", "", errors.New("mount point with working directory not found")
} }