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

Merge pull request #4250 from thaJeztah/tininits 

tini nits
This commit is contained in:
Sebastiaan van Stijn 2023-05-16 18:13:24 +01:00 committed by GitHub
parent 10bade23e1 2b7bfb3994
commit 8794455dc3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cli/command/container/hijack.go
View File

@ -87,7 +87,7 @@ func (h *hijackedIOStreamer) setupInput() (restore func(), err error) {
var restoreOnce sync.Once var restoreOnce sync.Once
restore = func() { restore = func() {
restoreOnce.Do(func() { restoreOnce.Do(func() {
restoreTerminal(h.streams, h.inputStream) _ = restoreTerminal(h.streams, h.inputStream)
}) })
} }

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
} }