Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cli/command/image/build: GetContextFromReader: rename var that collided 

This var collided with the `archive/tar` import.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2023-05-03 17:02:12 +02:00
parent ab17029c63
commit 2b7bfb3994
No known key found for this signature in database
GPG Key ID: 76698F39D527CE8C
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cli/command/image/build/context.go
View File

@ -161,13 +161,13 @@ func GetContextFromReader(rc io.ReadCloser, dockerfileName string) (out io.ReadC
return nil, "", err return nil, "", err
} }
tar, err := archive.Tar(dockerfileDir, archive.Uncompressed) tarArchive, err := archive.Tar(dockerfileDir, archive.Uncompressed)
if err != nil { if err != nil {
return nil, "", err return nil, "", err
} }
return ioutils.NewReadCloserWrapper(tar, func() error { return ioutils.NewReadCloserWrapper(tarArchive, func() error {
err := tar.Close() err := tarArchive.Close()
os.RemoveAll(dockerfileDir) os.RemoveAll(dockerfileDir)
return err return err
}), DefaultDockerfileName, nil }), DefaultDockerfileName, nil
@ -432,8 +432,7 @@ func Compress(buildCtx io.ReadCloser) (io.ReadCloser, error) {
defer buildCtx.Close() defer buildCtx.Close()
if _, err := pools.Copy(compressWriter, buildCtx); err != nil { if _, err := pools.Copy(compressWriter, buildCtx); err != nil {
pipeWriter.CloseWithError( pipeWriter.CloseWithError(errors.Wrap(err, "failed to compress context"))
errors.Wrap(err, "failed to compress context"))
compressWriter.Close() compressWriter.Close()
return return
} }