Skip to content

Commit d1c7653

Browse files
authored
Merge pull request #5719 from dmcgowan/build-context-io-copy
Use io.copy for build context compression
2 parents 7138107 + 7b37f30 commit d1c7653

File tree

3 files changed

+1
-140
lines changed

3 files changed

+1
-140
lines changed

cli/command/image/build/context.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import (
1717
"github.com/docker/docker/builder/remotecontext/git"
1818
"github.com/docker/docker/pkg/archive"
1919
"github.com/docker/docker/pkg/ioutils"
20-
"github.com/docker/docker/pkg/pools"
2120
"github.com/docker/docker/pkg/progress"
2221
"github.com/docker/docker/pkg/streamformatter"
2322
"github.com/docker/docker/pkg/stringid"
@@ -434,7 +433,7 @@ func Compress(buildCtx io.ReadCloser) (io.ReadCloser, error) {
434433
}
435434
defer buildCtx.Close()
436435

437-
if _, err := pools.Copy(compressWriter, buildCtx); err != nil {
436+
if _, err := io.Copy(compressWriter, buildCtx); err != nil {
438437
pipeWriter.CloseWithError(errors.Wrap(err, "failed to compress context"))
439438
compressWriter.Close()
440439
return

vendor/github.com/docker/docker/pkg/pools/pools.go

-137
This file was deleted.

vendor/modules.txt

-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ github.com/docker/docker/pkg/idtools
8888
github.com/docker/docker/pkg/ioutils
8989
github.com/docker/docker/pkg/jsonmessage
9090
github.com/docker/docker/pkg/longpath
91-
github.com/docker/docker/pkg/pools
9291
github.com/docker/docker/pkg/process
9392
github.com/docker/docker/pkg/progress
9493
github.com/docker/docker/pkg/stdcopy

0 commit comments

Comments
 (0)