self-hosted/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2024-12-24 10:07:21 +02:00
Code Issues Releases Activity

fix: docker backend should not close 'engine.Tail' result (#1616) (#1620)

Browse Source 
Backport #1616

Close #1615

The error described in
https://github.com/woodpecker-ci/woodpecker/issues/1615 is happening
because `Tail` method of the docker backend closes the instance of
`io.ReadCloser` it returns in `defer` function. As a result anything
that try to read data returned by `Tail` method eventually will attempt
to read from closes reader and get an error:



2171212c5a/pipeline/backend/docker/docker.go (L229)

The fix is just don't close returned reader and let the consumer of
`Tail` method do it. Good thing is that `Tail` is used only in one place
and reader is correctly closed:



2171212c5a/pipeline/pipeline.go (L231-L237)

Example of `woodpecker exec` output using pipeline from
https://github.com/woodpecker-ci/woodpecker/issues/1615 with the fix:

```
woodpecker exec .woodpecker.yaml
[step1:L0:0s] + echo step1
[step1:L1:0s] step1
[step2:L0:0s] + echo step2
[step2:L1:0s] step2
```

Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com>
Co-authored-by: Alexander Matyushentsev <AMatyushentsev@gmail.com>
Co-authored-by: Lauris BH <lauris@nix.lv>
This commit is contained in:
6543 2023-03-14 12:22:52 +01:00 committed by GitHub
parent 648cd606bc
commit d07c66d956
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pipeline/backend/docker/docker.go
View File

@ -184,7 +184,6 @@ func (e *docker) Tail(ctx context.Context, proc *backend.Step) (io.ReadCloser, e
_, _ = stdcopy.StdCopy(wc, wc, logs) _, _ = stdcopy.StdCopy(wc, wc, logs)
_ = logs.Close() _ = logs.Close()
_ = wc.Close() _ = wc.Close()
_ = rc.Close()
}() }()
return rc, nil return rc, nil
} }