From ab17029c636c70401c444e7d08a5166a2890c463 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 3 May 2023 17:01:08 +0200 Subject: [PATCH 1/2] cli/command/container: hijackedIOStreamer: explicitly ignore err Make the linters and IDEs happier Signed-off-by: Sebastiaan van Stijn --- cli/command/container/hijack.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/command/container/hijack.go b/cli/command/container/hijack.go index 7ecf5f5057..cd91e69514 100644 --- a/cli/command/container/hijack.go +++ b/cli/command/container/hijack.go @@ -87,7 +87,7 @@ func (h *hijackedIOStreamer) setupInput() (restore func(), err error) { var restoreOnce sync.Once restore = func() { restoreOnce.Do(func() { - restoreTerminal(h.streams, h.inputStream) + _ = restoreTerminal(h.streams, h.inputStream) }) } From 2b7bfb3994f2f0b6401f8c4c2ff02dc0c7928d22 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 3 May 2023 17:02:12 +0200 Subject: [PATCH 2/2] cli/command/image/build: GetContextFromReader: rename var that collided This var collided with the `archive/tar` import. Signed-off-by: Sebastiaan van Stijn --- cli/command/image/build/context.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/cli/command/image/build/context.go b/cli/command/image/build/context.go index c4deef7e08..b029a60095 100644 --- a/cli/command/image/build/context.go +++ b/cli/command/image/build/context.go @@ -161,13 +161,13 @@ func GetContextFromReader(rc io.ReadCloser, dockerfileName string) (out io.ReadC return nil, "", err } - tar, err := archive.Tar(dockerfileDir, archive.Uncompressed) + tarArchive, err := archive.Tar(dockerfileDir, archive.Uncompressed) if err != nil { return nil, "", err } - return ioutils.NewReadCloserWrapper(tar, func() error { - err := tar.Close() + return ioutils.NewReadCloserWrapper(tarArchive, func() error { + err := tarArchive.Close() os.RemoveAll(dockerfileDir) return err }), DefaultDockerfileName, nil @@ -432,8 +432,7 @@ func Compress(buildCtx io.ReadCloser) (io.ReadCloser, error) { defer buildCtx.Close() if _, err := pools.Copy(compressWriter, buildCtx); err != nil { - pipeWriter.CloseWithError( - errors.Wrap(err, "failed to compress context")) + pipeWriter.CloseWithError(errors.Wrap(err, "failed to compress context")) compressWriter.Close() return }