diff --git a/docker/Dockerfile.linux.amd64 b/docker/Dockerfile.linux.amd64 index aee685a..5804eb2 100644 --- a/docker/Dockerfile.linux.amd64 +++ b/docker/Dockerfile.linux.amd64 @@ -3,7 +3,7 @@ FROM docker:dind ENV DOCKER_HOST=unix:///var/run/docker.sock RUN apk add --no-cache ca-certificates curl -RUN curl -s https://raw.githubusercontent.com/nektos/act/master/install.sh | sh -s v0.2.34 +RUN curl -s https://raw.githubusercontent.com/nektos/act/master/install.sh | sh -s v0.2.48 ADD release/linux/amd64/plugin /bin/ ENTRYPOINT ["/usr/local/bin/dockerd-entrypoint.sh", "/bin/plugin"] \ No newline at end of file diff --git a/plugin.go b/plugin.go index 8d95c67..cfd7ce3 100644 --- a/plugin.go +++ b/plugin.go @@ -133,7 +133,7 @@ func trace(cmd *exec.Cmd) { func getWorkDirPath(p Plugin, ctx context.Context) (string, string, error) { // Connect to the docker - docker, err := docker.NewClient("unix://" + daemon.StdDockerSocketPath, "v1.40", nil, nil) + docker, err := docker.NewClient("unix://" + daemon.StdDockerSocketPath, "v1.25", nil, nil) if err != nil { return "", "", errors.Wrap(err, "failed to create docker client") } @@ -145,24 +145,17 @@ func getWorkDirPath(p Plugin, ctx context.Context) (string, string, error) { return "", "", errors.Wrap(err, "failed to get our container id") } - fmt.Fprintf(os.Stdout, "Container ID = %s\n", cntrId); - // Find the proper mount cwd, err := os.Getwd() if err != nil { return "", "", errors.Wrap(err, "failed to locate the working directory in the container") } - fmt.Fprintf(os.Stdout, "CWD = %s\n", cwd); - cntr, err := docker.ContainerInspect(ctx, cntrId) if err != nil { return "", "", errors.Wrap(err, "failed to inspect ourselves as a container") } - fmt.Fprintf(os.Stdout, "Container = %+v\n", cntr); - fmt.Fprintf(os.Stdout, "Mounts = %+v\n", cntr.Mounts); for _, i := range cntr.Mounts { - fmt.Fprintf(os.Stdout, "\tDestination = %s\n", i.Destination); if i.Destination == cwd { return i.Source, i.Destination, nil }