github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Move archive to pkg/archive

Browse Source 
Signed-off-by: Derek McGowan <derek@mcg.dev>
This commit is contained in:
Derek McGowan 2024-01-17 09:54:18 -08:00
parent fcd39ccc53
commit 8e14c39e80
No known key found for this signature in database
GPG Key ID: F58C5D0A4405ACDB
39 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/install.go
View File

@ -26,10 +26,10 @@ import (
"runtime" "runtime"
"strings" "strings"
"github.com/containerd/containerd/v2/archive"
"github.com/containerd/containerd/v2/archive/compression"
"github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/images"
"github.com/containerd/containerd/v2/pkg/archive"
"github.com/containerd/containerd/v2/pkg/archive/compression"
) )
// Install a binary image into the opt service. // Install a binary image into the opt service.

2
contrib/fuzz/archive_fuzzer.go
View File

@ -25,8 +25,8 @@ import (
fuzz "github.com/AdaLogics/go-fuzz-headers" fuzz "github.com/AdaLogics/go-fuzz-headers"
"github.com/containerd/containerd/v2/archive"
imageArchive "github.com/containerd/containerd/v2/core/images/archive" imageArchive "github.com/containerd/containerd/v2/core/images/archive"
"github.com/containerd/containerd/v2/pkg/archive"
"github.com/containerd/containerd/v2/plugins/content/local" "github.com/containerd/containerd/v2/plugins/content/local"
"github.com/containerd/log" "github.com/containerd/log"
ocispec "github.com/opencontainers/image-spec/specs-go/v1" ocispec "github.com/opencontainers/image-spec/specs-go/v1"

2
core/diff/apply/apply_darwin.go
View File

@ -21,8 +21,8 @@ import (
"io" "io"
"os" "os"
"github.com/containerd/containerd/v2/archive"
"github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/mount"
"github.com/containerd/containerd/v2/pkg/archive"
) )
func apply(ctx context.Context, mounts []mount.Mount, r io.Reader, _sync bool) error { func apply(ctx context.Context, mounts []mount.Mount, r io.Reader, _sync bool) error {

2
core/diff/apply/apply_linux.go
View File

@ -23,9 +23,9 @@ import (
"os" "os"
"strings" "strings"
"github.com/containerd/containerd/v2/archive"
"github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/mount"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/pkg/archive"
"github.com/containerd/containerd/v2/pkg/userns" "github.com/containerd/containerd/v2/pkg/userns"
"golang.org/x/sys/unix" "golang.org/x/sys/unix"

2
core/diff/apply/apply_other.go
View File

@ -22,8 +22,8 @@ import (
"context" "context"
"io" "io"
"github.com/containerd/containerd/v2/archive"
"github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/mount"
"github.com/containerd/containerd/v2/pkg/archive"
) )
func apply(ctx context.Context, mounts []mount.Mount, r io.Reader, _sync bool) error { func apply(ctx context.Context, mounts []mount.Mount, r io.Reader, _sync bool) error {

2
core/diff/stream.go
View File

@ -22,8 +22,8 @@ import (
"io" "io"
"os" "os"
"github.com/containerd/containerd/v2/archive/compression"
"github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/images"
"github.com/containerd/containerd/v2/pkg/archive/compression"
"github.com/containerd/typeurl/v2" "github.com/containerd/typeurl/v2"
ocispec "github.com/opencontainers/image-spec/specs-go/v1" ocispec "github.com/opencontainers/image-spec/specs-go/v1"
) )

2
core/images/archive/importer.go
View File

@ -27,11 +27,11 @@ import (
"io" "io"
"path" "path"
"github.com/containerd/containerd/v2/archive/compression"
"github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/images"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/labels"
"github.com/containerd/containerd/v2/pkg/archive/compression"
"github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/platforms"
"github.com/containerd/log" "github.com/containerd/log"
digest "github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"

2
core/images/converter/uncompress/uncompress.go
View File

@ -21,12 +21,12 @@ import (
"fmt" "fmt"
"io" "io"
"github.com/containerd/containerd/v2/archive/compression"
"github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/images"
"github.com/containerd/containerd/v2/core/images/converter" "github.com/containerd/containerd/v2/core/images/converter"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/labels"
"github.com/containerd/containerd/v2/pkg/archive/compression"
ocispec "github.com/opencontainers/image-spec/specs-go/v1" ocispec "github.com/opencontainers/image-spec/specs-go/v1"
) )

2
core/images/diffid.go
View File

@ -23,9 +23,9 @@ import (
"github.com/opencontainers/go-digest" "github.com/opencontainers/go-digest"
ocispec "github.com/opencontainers/image-spec/specs-go/v1" ocispec "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/containerd/containerd/v2/archive/compression"
"github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/labels"
"github.com/containerd/containerd/v2/pkg/archive/compression"
"github.com/containerd/log" "github.com/containerd/log"
) )

2
core/remotes/docker/schema1/converter.go
View File

@ -32,12 +32,12 @@ import (
"sync" "sync"
"time" "time"
"github.com/containerd/containerd/v2/archive/compression"
"github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/images"
"github.com/containerd/containerd/v2/core/remotes" "github.com/containerd/containerd/v2/core/remotes"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/labels"
"github.com/containerd/containerd/v2/pkg/archive/compression"
"github.com/containerd/log" "github.com/containerd/log"
digest "github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"
specs "github.com/opencontainers/image-spec/specs-go" specs "github.com/opencontainers/image-spec/specs-go"

4
integration/client/import_test.go
View File

@ -32,8 +32,6 @@ import (
"testing" "testing"
"time" "time"
"github.com/containerd/containerd/v2/archive/compression"
"github.com/containerd/containerd/v2/archive/tartest"
. "github.com/containerd/containerd/v2/client" . "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/images"
@ -41,6 +39,8 @@ import (
"github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/core/leases"
"github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/oci"
"github.com/containerd/containerd/v2/pkg/archive/compression"
"github.com/containerd/containerd/v2/pkg/archive/tartest"
"github.com/containerd/containerd/v2/pkg/transfer" "github.com/containerd/containerd/v2/pkg/transfer"
tarchive "github.com/containerd/containerd/v2/pkg/transfer/archive" tarchive "github.com/containerd/containerd/v2/pkg/transfer/archive"
"github.com/containerd/containerd/v2/pkg/transfer/image" "github.com/containerd/containerd/v2/pkg/transfer/image"

2
integration/release_upgrade_utils_linux_test.go
View File

@ -29,7 +29,7 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"golang.org/x/mod/semver" "golang.org/x/mod/semver"
"github.com/containerd/containerd/v2/archive" "github.com/containerd/containerd/v2/pkg/archive"
"github.com/containerd/containerd/v2/version" "github.com/containerd/containerd/v2/version"
) )

0
archive/compression/benchmark_test.go → pkg/archive/compression/benchmark_test.go
View File

0
archive/compression/compression.go → pkg/archive/compression/compression.go
View File

0
archive/compression/compression_fuzzer.go → pkg/archive/compression/compression_fuzzer.go
View File

0
archive/compression/compression_test.go → pkg/archive/compression/compression_test.go
View File

2
archive/issues_test.go → pkg/archive/issues_test.go
View File

@ -24,7 +24,7 @@ import (
"strings" "strings"
"testing" "testing"
"github.com/containerd/containerd/v2/archive/compression" "github.com/containerd/containerd/v2/pkg/archive/compression"
"github.com/containerd/containerd/v2/pkg/testutil" "github.com/containerd/containerd/v2/pkg/testutil"
) )

0
archive/link_default.go → pkg/archive/link_default.go
View File

0
archive/link_freebsd.go → pkg/archive/link_freebsd.go
View File

2
archive/tar.go → pkg/archive/tar.go
View File

@ -29,7 +29,7 @@ import (
"syscall" "syscall"
"time" "time"
"github.com/containerd/containerd/v2/archive/tarheader" "github.com/containerd/containerd/v2/pkg/archive/tarheader"
"github.com/containerd/containerd/v2/pkg/epoch" "github.com/containerd/containerd/v2/pkg/epoch"
"github.com/containerd/containerd/v2/pkg/userns" "github.com/containerd/containerd/v2/pkg/userns"
"github.com/containerd/continuity/fs" "github.com/containerd/continuity/fs"

0
archive/tar_freebsd.go → pkg/archive/tar_freebsd.go
View File

0
archive/tar_linux_test.go → pkg/archive/tar_linux_test.go
View File

0
archive/tar_mostunix.go → pkg/archive/tar_mostunix.go
View File

0
archive/tar_opts.go → pkg/archive/tar_opts.go
View File

0
archive/tar_opts_linux.go → pkg/archive/tar_opts_linux.go
View File

0
archive/tar_opts_windows.go → pkg/archive/tar_opts_windows.go
View File

2
archive/tar_test.go → pkg/archive/tar_test.go
View File

@ -33,7 +33,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/containerd/containerd/v2/archive/tartest" "github.com/containerd/containerd/v2/pkg/archive/tartest"
"github.com/containerd/containerd/v2/pkg/testutil" "github.com/containerd/containerd/v2/pkg/testutil"
"github.com/containerd/continuity/fs" "github.com/containerd/continuity/fs"
"github.com/containerd/continuity/fs/fstest" "github.com/containerd/continuity/fs/fstest"

0
archive/tar_unix.go → pkg/archive/tar_unix.go
View File

0
archive/tar_windows.go → pkg/archive/tar_windows.go
View File

0
archive/tarheader/tarheader.go → pkg/archive/tarheader/tarheader.go
View File

0
archive/tarheader/tarheader_unix.go → pkg/archive/tarheader/tarheader_unix.go
View File

0
archive/tartest/tar.go → pkg/archive/tartest/tar.go
View File

0
archive/time.go → pkg/archive/time.go
View File

0
archive/time_unix.go → pkg/archive/time_unix.go
View File

0
archive/time_windows.go → pkg/archive/time_windows.go
View File

4
plugins/diff/walking/differ.go
View File

@ -25,13 +25,13 @@ import (
"io" "io"
"time" "time"
"github.com/containerd/containerd/v2/archive"
"github.com/containerd/containerd/v2/archive/compression"
"github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/core/diff"
"github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/mount"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/labels"
"github.com/containerd/containerd/v2/pkg/archive"
"github.com/containerd/containerd/v2/pkg/archive/compression"
"github.com/containerd/containerd/v2/pkg/epoch" "github.com/containerd/containerd/v2/pkg/epoch"
"github.com/containerd/log" "github.com/containerd/log"
digest "github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"

2
plugins/diff/windows/cimfs.go
View File

@ -24,12 +24,12 @@ import (
"fmt" "fmt"
"github.com/Microsoft/hcsshim/pkg/cimfs" "github.com/Microsoft/hcsshim/pkg/cimfs"
"github.com/containerd/containerd/v2/archive"
"github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/core/diff"
"github.com/containerd/containerd/v2/core/metadata" "github.com/containerd/containerd/v2/core/metadata"
"github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/mount"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/pkg/archive"
"github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/platforms"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"
"github.com/containerd/plugin" "github.com/containerd/plugin"

4
plugins/diff/windows/windows.go
View File

@ -28,14 +28,14 @@ import (
"time" "time"
"github.com/Microsoft/go-winio" "github.com/Microsoft/go-winio"
"github.com/containerd/containerd/v2/archive"
"github.com/containerd/containerd/v2/archive/compression"
"github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/core/diff"
"github.com/containerd/containerd/v2/core/metadata" "github.com/containerd/containerd/v2/core/metadata"
"github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/mount"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/labels"
"github.com/containerd/containerd/v2/pkg/archive"
"github.com/containerd/containerd/v2/pkg/archive/compression"
"github.com/containerd/containerd/v2/pkg/epoch" "github.com/containerd/containerd/v2/pkg/epoch"
"github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/platforms"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"

2
plugins/services/tasks/local.go
View File

@ -29,7 +29,6 @@ import (
api "github.com/containerd/containerd/v2/api/services/tasks/v1" api "github.com/containerd/containerd/v2/api/services/tasks/v1"
"github.com/containerd/containerd/v2/api/types" "github.com/containerd/containerd/v2/api/types"
"github.com/containerd/containerd/v2/api/types/task" "github.com/containerd/containerd/v2/api/types/task"
"github.com/containerd/containerd/v2/archive"
"github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/images"
@ -38,6 +37,7 @@ import (
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/events" "github.com/containerd/containerd/v2/events"
"github.com/containerd/containerd/v2/filters" "github.com/containerd/containerd/v2/filters"
"github.com/containerd/containerd/v2/pkg/archive"
"github.com/containerd/containerd/v2/pkg/blockio" "github.com/containerd/containerd/v2/pkg/blockio"
"github.com/containerd/containerd/v2/pkg/rdt" "github.com/containerd/containerd/v2/pkg/rdt"
"github.com/containerd/containerd/v2/pkg/timeout" "github.com/containerd/containerd/v2/pkg/timeout"