Move pkg/progress to api/pkg/progress

dmcgowan · thaJeztah · commit 66862e14d16b · 2025-07-30T14:22:31.000+02:00
Signed-off-by: Derek McGowan &lt;derek@mcg.dev&gt;
Signed-off-by: Sebastiaan van Stijn &lt;github@gone.nl&gt;
diff --git a/api/go.mod b/api/go.mod
@@ -8,6 +8,7 @@ require (
 	github.com/moby/docker-image-spec v1.3.1
 	github.com/opencontainers/go-digest v1.0.0
 	github.com/opencontainers/image-spec v1.1.1
+	golang.org/x/time v0.11.0
 	gotest.tools/v3 v3.5.2
 )
 
diff --git a/api/go.sum b/api/go.sum
@@ -10,5 +10,7 @@ github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
 github.com/opencontainers/image-spec v1.1.1 h1:y0fUlFfIZhPF1W537XOLg0/fcx6zcHCJwooC2xJA040=
 github.com/opencontainers/image-spec v1.1.1/go.mod h1:qpqAh3Dmcf36wStyyWU+kCeDgrGnAve2nCC8+7h8Q0M=
+golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0=
+golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
 gotest.tools/v3 v3.5.2 h1:7koQfIKdy+I8UTetycgUqXWSDwpgv193Ka+qRsmBY8Q=
 gotest.tools/v3 v3.5.2/go.mod h1:LtdLGcnqToBH83WByAAi/wiwSFCArdFIUV/xxN4pcjA=
diff --git a/api/pkg/progress/progress.go b/api/pkg/progress/progress.go
diff --git a/api/pkg/progress/progressreader.go b/api/pkg/progress/progressreader.go
diff --git a/api/pkg/progress/progressreader_test.go b/api/pkg/progress/progressreader_test.go
diff --git a/daemon/builder/dockerfile/copy.go b/daemon/builder/dockerfile/copy.go
@@ -19,10 +19,10 @@ import (
 	"github.com/docker/docker/daemon/builder/remotecontext/urlutil"
 	"github.com/docker/docker/daemon/internal/system"
 	"github.com/docker/docker/pkg/longpath"
-	"github.com/docker/docker/pkg/progress"
 	"github.com/docker/docker/pkg/streamformatter"
 	"github.com/moby/buildkit/frontend/dockerfile/instructions"
 	"github.com/moby/go-archive"
+	"github.com/moby/moby/api/pkg/progress"
 	"github.com/moby/sys/symlink"
 	"github.com/moby/sys/user"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
diff --git a/daemon/containerd/image_builder.go b/daemon/containerd/image_builder.go
@@ -27,10 +27,10 @@ import (
 	"github.com/docker/docker/daemon/internal/stringid"
 	"github.com/docker/docker/daemon/server/backend"
 	"github.com/docker/docker/errdefs"
-	"github.com/docker/docker/pkg/progress"
 	"github.com/docker/docker/pkg/streamformatter"
 	imagespec "github.com/moby/docker-image-spec/specs-go/v1"
 	"github.com/moby/go-archive"
+	"github.com/moby/moby/api/pkg/progress"
 	"github.com/moby/moby/api/types/container"
 	"github.com/moby/moby/api/types/events"
 	"github.com/moby/moby/api/types/registry"
diff --git a/daemon/containerd/image_pull.go b/daemon/containerd/image_pull.go
@@ -20,8 +20,8 @@ import (
 	"github.com/docker/docker/daemon/internal/metrics"
 	"github.com/docker/docker/daemon/internal/stringid"
 	"github.com/docker/docker/errdefs"
-	"github.com/docker/docker/pkg/progress"
 	"github.com/docker/docker/pkg/streamformatter"
+	"github.com/moby/moby/api/pkg/progress"
 	"github.com/moby/moby/api/types/events"
 	registrytypes "github.com/moby/moby/api/types/registry"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
diff --git a/daemon/containerd/image_push.go b/daemon/containerd/image_push.go
@@ -19,8 +19,8 @@ import (
 	"github.com/distribution/reference"
 	"github.com/docker/docker/daemon/internal/metrics"
 	"github.com/docker/docker/errdefs"
-	"github.com/docker/docker/pkg/progress"
 	"github.com/docker/docker/pkg/streamformatter"
+	"github.com/moby/moby/api/pkg/progress"
 	"github.com/moby/moby/api/types/auxprogress"
 	"github.com/moby/moby/api/types/events"
 	"github.com/moby/moby/api/types/registry"
diff --git a/daemon/containerd/progress.go b/daemon/containerd/progress.go
@@ -19,7 +19,7 @@ import (
 	"github.com/distribution/reference"
 	"github.com/docker/docker/daemon/internal/stringid"
 	"github.com/docker/docker/errdefs"
-	"github.com/docker/docker/pkg/progress"
+	"github.com/moby/moby/api/pkg/progress"
 	"github.com/opencontainers/go-digest"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 )
diff --git a/daemon/images/image_builder.go b/daemon/images/image_builder.go
@@ -14,8 +14,8 @@ import (
 	"github.com/docker/docker/daemon/internal/layer"
 	"github.com/docker/docker/daemon/internal/stringid"
 	"github.com/docker/docker/daemon/server/backend"
-	"github.com/docker/docker/pkg/progress"
 	"github.com/docker/docker/pkg/streamformatter"
+	"github.com/moby/moby/api/pkg/progress"
 	"github.com/moby/moby/api/types/registry"
 	"github.com/opencontainers/go-digest"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
diff --git a/daemon/images/image_pull.go b/daemon/images/image_pull.go
@@ -14,8 +14,8 @@ import (
 	progressutils "github.com/docker/docker/daemon/internal/distribution/utils"
 	"github.com/docker/docker/daemon/internal/metrics"
 	"github.com/docker/docker/daemon/server/backend"
-	"github.com/docker/docker/pkg/progress"
 	"github.com/docker/docker/pkg/streamformatter"
+	"github.com/moby/moby/api/pkg/progress"
 	"github.com/moby/moby/api/types/registry"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"
diff --git a/daemon/images/image_push.go b/daemon/images/image_push.go
@@ -11,7 +11,7 @@ import (
 	progressutils "github.com/docker/docker/daemon/internal/distribution/utils"
 	"github.com/docker/docker/daemon/internal/metrics"
 	"github.com/docker/docker/daemon/server/backend"
-	"github.com/docker/docker/pkg/progress"
+	"github.com/moby/moby/api/pkg/progress"
 	"github.com/moby/moby/api/types/registry"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 )
diff --git a/daemon/internal/builder-next/adapters/containerimage/pull.go b/daemon/internal/builder-next/adapters/containerimage/pull.go
@@ -31,7 +31,6 @@ import (
 	"github.com/docker/docker/daemon/internal/image"
 	"github.com/docker/docker/daemon/internal/layer"
 	refstore "github.com/docker/docker/daemon/internal/refstore"
-	pkgprogress "github.com/docker/docker/pkg/progress"
 	"github.com/moby/buildkit/cache"
 	"github.com/moby/buildkit/client"
 	"github.com/moby/buildkit/client/llb/sourceresolver"
@@ -48,6 +47,7 @@ import (
 	"github.com/moby/buildkit/util/leaseutil"
 	"github.com/moby/buildkit/util/progress"
 	"github.com/moby/buildkit/util/resolver"
+	pkgprogress "github.com/moby/moby/api/pkg/progress"
 	"github.com/opencontainers/go-digest"
 	"github.com/opencontainers/image-spec/identity"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
diff --git a/daemon/internal/builder-next/worker/worker.go b/daemon/internal/builder-next/worker/worker.go
@@ -20,7 +20,6 @@ import (
 	distmetadata "github.com/docker/docker/daemon/internal/distribution/metadata"
 	"github.com/docker/docker/daemon/internal/distribution/xfer"
 	"github.com/docker/docker/daemon/internal/layer"
-	pkgprogress "github.com/docker/docker/pkg/progress"
 	"github.com/moby/buildkit/cache"
 	cacheconfig "github.com/moby/buildkit/cache/config"
 	"github.com/moby/buildkit/client"
@@ -48,6 +47,7 @@ import (
 	"github.com/moby/buildkit/util/leaseutil"
 	"github.com/moby/buildkit/util/progress"
 	"github.com/moby/buildkit/version"
+	pkgprogress "github.com/moby/moby/api/pkg/progress"
 	"github.com/opencontainers/go-digest"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"
diff --git a/daemon/internal/distribution/config.go b/daemon/internal/distribution/config.go
@@ -15,7 +15,7 @@ import (
 	"github.com/docker/docker/daemon/internal/layer"
 	refstore "github.com/docker/docker/daemon/internal/refstore"
 	registrypkg "github.com/docker/docker/daemon/pkg/registry"
-	"github.com/docker/docker/pkg/progress"
+	"github.com/moby/moby/api/pkg/progress"
 	"github.com/moby/moby/api/types/events"
 	"github.com/moby/moby/api/types/registry"
 	"github.com/opencontainers/go-digest"
diff --git a/daemon/internal/distribution/pull_v2.go b/daemon/internal/distribution/pull_v2.go
@@ -25,7 +25,7 @@ import (
 	"github.com/docker/docker/daemon/internal/stringid"
 	"github.com/docker/docker/daemon/pkg/registry"
 	"github.com/docker/docker/pkg/ioutils"
-	"github.com/docker/docker/pkg/progress"
+	"github.com/moby/moby/api/pkg/progress"
 	"github.com/opencontainers/go-digest"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"
diff --git a/daemon/internal/distribution/push.go b/daemon/internal/distribution/push.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/containerd/log"
 	"github.com/distribution/reference"
-	"github.com/docker/docker/pkg/progress"
+	"github.com/moby/moby/api/pkg/progress"
 	"github.com/moby/moby/api/types/events"
 )
 
diff --git a/daemon/internal/distribution/push_v2.go b/daemon/internal/distribution/push_v2.go
@@ -20,7 +20,7 @@ import (
 	"github.com/docker/docker/daemon/internal/stringid"
 	"github.com/docker/docker/daemon/pkg/registry"
 	"github.com/docker/docker/pkg/ioutils"
-	"github.com/docker/docker/pkg/progress"
+	"github.com/moby/moby/api/pkg/progress"
 	apitypes "github.com/moby/moby/api/types"
 	"github.com/opencontainers/go-digest"
 	"github.com/pkg/errors"
diff --git a/daemon/internal/distribution/push_v2_test.go b/daemon/internal/distribution/push_v2_test.go
@@ -14,7 +14,7 @@ import (
 	"github.com/docker/docker/daemon/internal/layer"
 	refstore "github.com/docker/docker/daemon/internal/refstore"
 	registrypkg "github.com/docker/docker/daemon/pkg/registry"
-	"github.com/docker/docker/pkg/progress"
+	"github.com/moby/moby/api/pkg/progress"
 	"github.com/moby/moby/api/types/registry"
 	"github.com/opencontainers/go-digest"
 	"gotest.tools/v3/assert"
diff --git a/daemon/internal/distribution/utils/progress.go b/daemon/internal/distribution/utils/progress.go
@@ -7,8 +7,8 @@ import (
 	"syscall"
 
 	"github.com/containerd/log"
-	"github.com/docker/docker/pkg/progress"
 	"github.com/docker/docker/pkg/streamformatter"
+	"github.com/moby/moby/api/pkg/progress"
 )
 
 // WriteDistributionProgress is a helper for writing progress from chan to JSON
diff --git a/daemon/internal/distribution/xfer/download.go b/daemon/internal/distribution/xfer/download.go
@@ -12,8 +12,8 @@ import (
 	"github.com/docker/docker/daemon/internal/image"
 	"github.com/docker/docker/daemon/internal/layer"
 	"github.com/docker/docker/pkg/ioutils"
-	"github.com/docker/docker/pkg/progress"
 	"github.com/moby/go-archive/compression"
+	"github.com/moby/moby/api/pkg/progress"
 )
 
 const maxDownloadAttempts = 5
diff --git a/daemon/internal/distribution/xfer/download_test.go b/daemon/internal/distribution/xfer/download_test.go
@@ -13,7 +13,7 @@ import (
 
 	"github.com/docker/distribution"
 	"github.com/docker/docker/daemon/internal/layer"
-	"github.com/docker/docker/pkg/progress"
+	"github.com/moby/moby/api/pkg/progress"
 	"github.com/opencontainers/go-digest"
 	"github.com/opencontainers/image-spec/identity"
 	"gotest.tools/v3/assert"
diff --git a/daemon/internal/distribution/xfer/transfer.go b/daemon/internal/distribution/xfer/transfer.go
@@ -5,7 +5,7 @@ import (
 	"runtime"
 	"sync"
 
-	"github.com/docker/docker/pkg/progress"
+	"github.com/moby/moby/api/pkg/progress"
 	"github.com/pkg/errors"
 )
 
diff --git a/daemon/internal/distribution/xfer/transfer_test.go b/daemon/internal/distribution/xfer/transfer_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/docker/docker/pkg/progress"
+	"github.com/moby/moby/api/pkg/progress"
 )
 
 func TestTransfer(t *testing.T) {
diff --git a/daemon/internal/distribution/xfer/upload.go b/daemon/internal/distribution/xfer/upload.go
@@ -8,7 +8,7 @@ import (
 	"github.com/containerd/log"
 	"github.com/docker/distribution"
 	"github.com/docker/docker/daemon/internal/layer"
-	"github.com/docker/docker/pkg/progress"
+	"github.com/moby/moby/api/pkg/progress"
 )
 
 const maxUploadAttempts = 5
diff --git a/daemon/internal/distribution/xfer/upload_test.go b/daemon/internal/distribution/xfer/upload_test.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/docker/distribution"
 	"github.com/docker/docker/daemon/internal/layer"
-	"github.com/docker/docker/pkg/progress"
+	"github.com/moby/moby/api/pkg/progress"
 )
 
 const maxUploadConcurrency = 3
diff --git a/daemon/internal/image/tarexport/load.go b/daemon/internal/image/tarexport/load.go
@@ -19,10 +19,10 @@ import (
 	"github.com/docker/docker/daemon/internal/ioutils"
 	"github.com/docker/docker/daemon/internal/layer"
 	"github.com/docker/docker/daemon/internal/stringid"
-	"github.com/docker/docker/pkg/progress"
 	"github.com/docker/docker/pkg/streamformatter"
 	"github.com/moby/go-archive/chrootarchive"
 	"github.com/moby/go-archive/compression"
+	"github.com/moby/moby/api/pkg/progress"
 	"github.com/moby/moby/api/types/events"
 	"github.com/moby/sys/sequential"
 	"github.com/moby/sys/symlink"
diff --git a/daemon/pkg/plugin/backend_linux.go b/daemon/pkg/plugin/backend_linux.go
@@ -29,8 +29,8 @@ import (
 	"github.com/docker/docker/errdefs"
 	"github.com/docker/docker/pkg/authorization"
 	"github.com/docker/docker/pkg/pools"
-	"github.com/docker/docker/pkg/progress"
 	"github.com/moby/go-archive/chrootarchive"
+	"github.com/moby/moby/api/pkg/progress"
 	"github.com/moby/moby/api/types"
 	"github.com/moby/moby/api/types/events"
 	"github.com/moby/moby/api/types/filters"
diff --git a/daemon/pkg/plugin/fetch_linux.go b/daemon/pkg/plugin/fetch_linux.go
@@ -16,8 +16,8 @@ import (
 	progressutils "github.com/docker/docker/daemon/internal/distribution/utils"
 	"github.com/docker/docker/daemon/internal/stringid"
 	"github.com/docker/docker/pkg/ioutils"
-	"github.com/docker/docker/pkg/progress"
 	"github.com/moby/go-archive/chrootarchive"
+	"github.com/moby/moby/api/pkg/progress"
 	"github.com/moby/moby/api/types/registry"
 	"github.com/opencontainers/go-digest"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
diff --git a/daemon/server/router/build/build_routes.go b/daemon/server/router/build/build_routes.go
@@ -19,8 +19,8 @@ import (
 	"github.com/docker/docker/daemon/server/backend"
 	"github.com/docker/docker/daemon/server/httputils"
 	"github.com/docker/docker/pkg/ioutils"
-	"github.com/docker/docker/pkg/progress"
 	"github.com/docker/docker/pkg/streamformatter"
+	"github.com/moby/moby/api/pkg/progress"
 	"github.com/moby/moby/api/types/build"
 	"github.com/moby/moby/api/types/container"
 	"github.com/moby/moby/api/types/filters"
diff --git a/daemon/server/router/image/image_routes.go b/daemon/server/router/image/image_routes.go
@@ -19,8 +19,8 @@ import (
 	"github.com/docker/docker/dockerversion"
 	"github.com/docker/docker/errdefs"
 	"github.com/docker/docker/pkg/ioutils"
-	"github.com/docker/docker/pkg/progress"
 	"github.com/docker/docker/pkg/streamformatter"
+	"github.com/moby/moby/api/pkg/progress"
 	"github.com/moby/moby/api/types/filters"
 	imagetypes "github.com/moby/moby/api/types/image"
 	"github.com/moby/moby/api/types/registry"
diff --git a/pkg/streamformatter/streamformatter.go b/pkg/streamformatter/streamformatter.go
@@ -9,8 +9,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/docker/docker/pkg/progress"
 	"github.com/docker/go-units"
+	"github.com/moby/moby/api/pkg/progress"
 	"github.com/moby/moby/api/types/jsonstream"
 )
 
diff --git a/vendor/github.com/moby/moby/api/pkg/progress/progress.go b/vendor/github.com/moby/moby/api/pkg/progress/progress.go
diff --git a/vendor/github.com/moby/moby/api/pkg/progress/progressreader.go b/vendor/github.com/moby/moby/api/pkg/progress/progressreader.go
diff --git a/vendor/modules.txt b/vendor/modules.txt

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ require (`
`8`	`8`	`github.com/moby/docker-image-spec v1.3.1`
`9`	`9`	`github.com/opencontainers/go-digest v1.0.0`
`10`	`10`	`github.com/opencontainers/image-spec v1.1.1`
	`11`	`+ golang.org/x/time v0.11.0`
`11`	`12`	`gotest.tools/v3 v3.5.2`
`12`	`13`	`)`
`13`	`14`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ import (`
`19`	`19`	`"github.com/distribution/reference"`
`20`	`20`	`"github.com/docker/docker/daemon/internal/stringid"`
`21`	`21`	`"github.com/docker/docker/errdefs"`
`22`		`- "github.com/docker/docker/pkg/progress"`
	`22`	`+ "github.com/moby/moby/api/pkg/progress"`
`23`	`23`	`"github.com/opencontainers/go-digest"`
`24`	`24`	`ocispec "github.com/opencontainers/image-spec/specs-go/v1"`
`25`	`25`	`)`