diff --git a/daemon/builder/remotecontext/archive.go b/daemon/builder/remotecontext/archive.go index 5993da3052..10e5e50967 100644 --- a/daemon/builder/remotecontext/archive.go +++ b/daemon/builder/remotecontext/archive.go @@ -6,9 +6,9 @@ import ( "path/filepath" "github.com/docker/docker/daemon/builder" + "github.com/docker/docker/daemon/builder/remotecontext/internal/tarsum" "github.com/docker/docker/pkg/longpath" "github.com/docker/docker/pkg/system" - "github.com/docker/docker/pkg/tarsum" "github.com/moby/go-archive/chrootarchive" "github.com/moby/go-archive/compression" "github.com/moby/sys/symlink" diff --git a/daemon/builder/remotecontext/filehash.go b/daemon/builder/remotecontext/filehash.go index 0f204ef376..3d4e06b84d 100644 --- a/daemon/builder/remotecontext/filehash.go +++ b/daemon/builder/remotecontext/filehash.go @@ -6,7 +6,7 @@ import ( "hash" "os" - "github.com/docker/docker/pkg/tarsum" + "github.com/docker/docker/daemon/builder/remotecontext/internal/tarsum" "github.com/moby/go-archive" ) diff --git a/pkg/tarsum/builder_context.go b/daemon/builder/remotecontext/internal/tarsum/builder_context.go similarity index 100% rename from pkg/tarsum/builder_context.go rename to daemon/builder/remotecontext/internal/tarsum/builder_context.go diff --git a/pkg/tarsum/builder_context_test.go b/daemon/builder/remotecontext/internal/tarsum/builder_context_test.go similarity index 100% rename from pkg/tarsum/builder_context_test.go rename to daemon/builder/remotecontext/internal/tarsum/builder_context_test.go diff --git a/pkg/tarsum/fileinfosums.go b/daemon/builder/remotecontext/internal/tarsum/fileinfosums.go similarity index 100% rename from pkg/tarsum/fileinfosums.go rename to daemon/builder/remotecontext/internal/tarsum/fileinfosums.go diff --git a/pkg/tarsum/fileinfosums_test.go b/daemon/builder/remotecontext/internal/tarsum/fileinfosums_test.go similarity index 100% rename from pkg/tarsum/fileinfosums_test.go rename to daemon/builder/remotecontext/internal/tarsum/fileinfosums_test.go diff --git a/pkg/tarsum/tarsum.go b/daemon/builder/remotecontext/internal/tarsum/tarsum.go similarity index 100% rename from pkg/tarsum/tarsum.go rename to daemon/builder/remotecontext/internal/tarsum/tarsum.go diff --git a/pkg/tarsum/tarsum_spec.md b/daemon/builder/remotecontext/internal/tarsum/tarsum_spec.md similarity index 100% rename from pkg/tarsum/tarsum_spec.md rename to daemon/builder/remotecontext/internal/tarsum/tarsum_spec.md diff --git a/pkg/tarsum/tarsum_test.go b/daemon/builder/remotecontext/internal/tarsum/tarsum_test.go similarity index 100% rename from pkg/tarsum/tarsum_test.go rename to daemon/builder/remotecontext/internal/tarsum/tarsum_test.go diff --git a/pkg/tarsum/testdata/46af0962ab5afeb5ce6740d4d91652e69206fc991fd5328c1a94d364ad00e457/json b/daemon/builder/remotecontext/internal/tarsum/testdata/46af0962ab5afeb5ce6740d4d91652e69206fc991fd5328c1a94d364ad00e457/json similarity index 100% rename from pkg/tarsum/testdata/46af0962ab5afeb5ce6740d4d91652e69206fc991fd5328c1a94d364ad00e457/json rename to daemon/builder/remotecontext/internal/tarsum/testdata/46af0962ab5afeb5ce6740d4d91652e69206fc991fd5328c1a94d364ad00e457/json diff --git a/pkg/tarsum/testdata/46af0962ab5afeb5ce6740d4d91652e69206fc991fd5328c1a94d364ad00e457/layer.tar b/daemon/builder/remotecontext/internal/tarsum/testdata/46af0962ab5afeb5ce6740d4d91652e69206fc991fd5328c1a94d364ad00e457/layer.tar similarity index 100% rename from pkg/tarsum/testdata/46af0962ab5afeb5ce6740d4d91652e69206fc991fd5328c1a94d364ad00e457/layer.tar rename to daemon/builder/remotecontext/internal/tarsum/testdata/46af0962ab5afeb5ce6740d4d91652e69206fc991fd5328c1a94d364ad00e457/layer.tar diff --git a/pkg/tarsum/testdata/511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158/json b/daemon/builder/remotecontext/internal/tarsum/testdata/511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158/json similarity index 100% rename from pkg/tarsum/testdata/511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158/json rename to daemon/builder/remotecontext/internal/tarsum/testdata/511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158/json diff --git a/pkg/tarsum/testdata/511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158/layer.tar b/daemon/builder/remotecontext/internal/tarsum/testdata/511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158/layer.tar similarity index 100% rename from pkg/tarsum/testdata/511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158/layer.tar rename to daemon/builder/remotecontext/internal/tarsum/testdata/511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158/layer.tar diff --git a/pkg/tarsum/testdata/collision/collision-0.tar b/daemon/builder/remotecontext/internal/tarsum/testdata/collision/collision-0.tar similarity index 100% rename from pkg/tarsum/testdata/collision/collision-0.tar rename to daemon/builder/remotecontext/internal/tarsum/testdata/collision/collision-0.tar diff --git a/pkg/tarsum/testdata/collision/collision-1.tar b/daemon/builder/remotecontext/internal/tarsum/testdata/collision/collision-1.tar similarity index 100% rename from pkg/tarsum/testdata/collision/collision-1.tar rename to daemon/builder/remotecontext/internal/tarsum/testdata/collision/collision-1.tar diff --git a/pkg/tarsum/testdata/collision/collision-2.tar b/daemon/builder/remotecontext/internal/tarsum/testdata/collision/collision-2.tar similarity index 100% rename from pkg/tarsum/testdata/collision/collision-2.tar rename to daemon/builder/remotecontext/internal/tarsum/testdata/collision/collision-2.tar diff --git a/pkg/tarsum/testdata/collision/collision-3.tar b/daemon/builder/remotecontext/internal/tarsum/testdata/collision/collision-3.tar similarity index 100% rename from pkg/tarsum/testdata/collision/collision-3.tar rename to daemon/builder/remotecontext/internal/tarsum/testdata/collision/collision-3.tar diff --git a/pkg/tarsum/testdata/xattr/json b/daemon/builder/remotecontext/internal/tarsum/testdata/xattr/json similarity index 100% rename from pkg/tarsum/testdata/xattr/json rename to daemon/builder/remotecontext/internal/tarsum/testdata/xattr/json diff --git a/pkg/tarsum/testdata/xattr/layer.tar b/daemon/builder/remotecontext/internal/tarsum/testdata/xattr/layer.tar similarity index 100% rename from pkg/tarsum/testdata/xattr/layer.tar rename to daemon/builder/remotecontext/internal/tarsum/testdata/xattr/layer.tar diff --git a/pkg/tarsum/versioning.go b/daemon/builder/remotecontext/internal/tarsum/versioning.go similarity index 100% rename from pkg/tarsum/versioning.go rename to daemon/builder/remotecontext/internal/tarsum/versioning.go diff --git a/pkg/tarsum/versioning_test.go b/daemon/builder/remotecontext/internal/tarsum/versioning_test.go similarity index 100% rename from pkg/tarsum/versioning_test.go rename to daemon/builder/remotecontext/internal/tarsum/versioning_test.go diff --git a/pkg/tarsum/writercloser.go b/daemon/builder/remotecontext/internal/tarsum/writercloser.go similarity index 100% rename from pkg/tarsum/writercloser.go rename to daemon/builder/remotecontext/internal/tarsum/writercloser.go