Merge pull request #5719 from dmcgowan/build-context-io-copy

Use io.copy for build context compression
docker · Jan 3, 2025 · d1c7653 · d1c7653
2 parents 7138107 + 7b37f30
commit d1c7653
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 140 deletions.
diff --git a/cli/command/image/build/context.go b/cli/command/image/build/context.go
@@ -17,7 +17,6 @@ import (
 	"github.com/docker/docker/builder/remotecontext/git"
 	"github.com/docker/docker/pkg/archive"
 	"github.com/docker/docker/pkg/ioutils"
-	"github.com/docker/docker/pkg/pools"
 	"github.com/docker/docker/pkg/progress"
 	"github.com/docker/docker/pkg/streamformatter"
 	"github.com/docker/docker/pkg/stringid"
@@ -434,7 +433,7 @@ func Compress(buildCtx io.ReadCloser) (io.ReadCloser, error) {
 		}
 		defer buildCtx.Close()
 
-		if _, err := pools.Copy(compressWriter, buildCtx); err != nil {
+		if _, err := io.Copy(compressWriter, buildCtx); err != nil {
 			pipeWriter.CloseWithError(errors.Wrap(err, "failed to compress context"))
 			compressWriter.Close()
 			return

diff --git a/vendor/github.com/docker/docker/pkg/pools/pools.go b/vendor/github.com/docker/docker/pkg/pools/pools.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -88,7 +88,6 @@ github.com/docker/docker/pkg/idtools
 github.com/docker/docker/pkg/ioutils
 github.com/docker/docker/pkg/jsonmessage
 github.com/docker/docker/pkg/longpath
-github.com/docker/docker/pkg/pools
 github.com/docker/docker/pkg/process
 github.com/docker/docker/pkg/progress
 github.com/docker/docker/pkg/stdcopy