Merge pull request #10407 from dmcgowan/fsverity-internal

Move fsverity package to internal
This commit is contained in:
Fu Wei 2024-07-01 21:31:55 +00:00 committed by GitHub
commit 3b2a14bb4c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 10 additions and 7 deletions

View File

@ -27,12 +27,13 @@ import (
"sync" "sync"
"time" "time"
"github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/pkg/filters"
"github.com/containerd/containerd/v2/pkg/fsverity"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
"github.com/containerd/log" "github.com/containerd/log"
"github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/internal/fsverity"
"github.com/containerd/containerd/v2/pkg/filters"
"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"
) )

View File

@ -32,12 +32,13 @@ import (
"testing" "testing"
"time" "time"
"github.com/containerd/errdefs"
"github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/core/content/testsuite" "github.com/containerd/containerd/v2/core/content/testsuite"
"github.com/containerd/containerd/v2/internal/fsverity"
"github.com/containerd/containerd/v2/internal/randutil" "github.com/containerd/containerd/v2/internal/randutil"
"github.com/containerd/containerd/v2/pkg/fsverity"
"github.com/containerd/containerd/v2/pkg/testutil" "github.com/containerd/containerd/v2/pkg/testutil"
"github.com/containerd/errdefs"
"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"

View File

@ -26,11 +26,12 @@ import (
"runtime" "runtime"
"time" "time"
"github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/pkg/fsverity"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
"github.com/containerd/log" "github.com/containerd/log"
"github.com/opencontainers/go-digest" "github.com/opencontainers/go-digest"
"github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/internal/fsverity"
) )
// writer represents a write transaction against the blob store. // writer represents a write transaction against the blob store.