Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update go module to imgcrypt v2 #168

Merged
merged 1 commit into from
Oct 24, 2024
Merged

Update go module to imgcrypt v2 #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions cmd/ctd-decoder/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,11 @@ import (
"io"
"os"

"github.com/containerd/imgcrypt"
"github.com/containerd/imgcrypt/images/encryption"
"github.com/containerd/typeurl/v2"

"github.com/containerd/imgcrypt/v2"
"github.com/containerd/imgcrypt/v2/images/encryption"

"github.com/containerd/containerd/v2/pkg/protobuf/proto"
"github.com/containerd/containerd/v2/pkg/protobuf/types"
"github.com/urfave/cli/v2"
Expand Down
4 changes: 2 additions & 2 deletions cmd/ctr/commands/images/crypt_utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import (
containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/core/images"
"github.com/containerd/imgcrypt/cmd/ctr/commands/img"
imgenc "github.com/containerd/imgcrypt/images/encryption"
"github.com/containerd/imgcrypt/images/encryption/parsehelpers"
imgenc "github.com/containerd/imgcrypt/v2/images/encryption"
"github.com/containerd/imgcrypt/v2/images/encryption/parsehelpers"
"github.com/containerd/platforms"
encconfig "github.com/containers/ocicrypt/config"
"github.com/urfave/cli/v2"
Expand Down
5 changes: 3 additions & 2 deletions cmd/ctr/commands/images/decrypt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,9 @@ import (
"github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/imgcrypt/cmd/ctr/commands/flags"
"github.com/containerd/imgcrypt/cmd/ctr/commands/img"
imgenc "github.com/containerd/imgcrypt/images/encryption"
"github.com/containerd/imgcrypt/images/encryption/parsehelpers"

imgenc "github.com/containerd/imgcrypt/v2/images/encryption"
"github.com/containerd/imgcrypt/v2/images/encryption/parsehelpers"

"github.com/urfave/cli/v2"
)
Expand Down
3 changes: 2 additions & 1 deletion cmd/ctr/commands/images/encrypt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ import (
"github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/imgcrypt/cmd/ctr/commands/flags"
"github.com/containerd/imgcrypt/cmd/ctr/commands/img"
"github.com/containerd/imgcrypt/images/encryption/parsehelpers"

"github.com/containerd/imgcrypt/v2/images/encryption/parsehelpers"

"github.com/urfave/cli/v2"
)
Expand Down
7 changes: 4 additions & 3 deletions cmd/ctr/commands/images/import.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,14 @@ import (
containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/core/images/archive"
"github.com/containerd/imgcrypt"
"github.com/containerd/imgcrypt/cmd/ctr/commands/flags"
"github.com/containerd/imgcrypt/images/encryption"
"github.com/containerd/imgcrypt/images/encryption/parsehelpers"
"github.com/containerd/log"
"github.com/containerd/platforms"
"github.com/urfave/cli/v2"

"github.com/containerd/imgcrypt/v2"
"github.com/containerd/imgcrypt/v2/images/encryption"
"github.com/containerd/imgcrypt/v2/images/encryption/parsehelpers"
)

var importCommand = cli.Command{
Expand Down
3 changes: 2 additions & 1 deletion cmd/ctr/commands/images/layerinfo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,11 @@ import (

"github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/imgcrypt/cmd/ctr/commands/img"
"github.com/containerd/imgcrypt/images/encryption/parsehelpers"
"github.com/containerd/platforms"
"github.com/containers/ocicrypt"

"github.com/containerd/imgcrypt/v2/images/encryption/parsehelpers"

"github.com/urfave/cli/v2"
)

Expand Down
7 changes: 4 additions & 3 deletions cmd/ctr/commands/images/pull.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,14 @@ import (
"github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/cmd/ctr/commands/content"
"github.com/containerd/containerd/v2/core/images"
"github.com/containerd/imgcrypt"
"github.com/containerd/imgcrypt/cmd/ctr/commands/flags"
"github.com/containerd/imgcrypt/images/encryption"
"github.com/containerd/imgcrypt/images/encryption/parsehelpers"
"github.com/containerd/log"
"github.com/containerd/platforms"

"github.com/containerd/imgcrypt/v2"
"github.com/containerd/imgcrypt/v2/images/encryption"
"github.com/containerd/imgcrypt/v2/images/encryption/parsehelpers"

"github.com/opencontainers/image-spec/identity"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/urfave/cli/v2"
Expand Down
7 changes: 4 additions & 3 deletions cmd/ctr/commands/run/run_unix.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,12 @@ import (
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/core/snapshots"
"github.com/containerd/containerd/v2/pkg/oci"
"github.com/containerd/imgcrypt"
"github.com/containerd/imgcrypt/images/encryption"
"github.com/containerd/imgcrypt/images/encryption/parsehelpers"
"github.com/containerd/platforms"

"github.com/containerd/imgcrypt/v2"
"github.com/containerd/imgcrypt/v2/images/encryption"
"github.com/containerd/imgcrypt/v2/images/encryption/parsehelpers"

"github.com/containerd/imgcrypt/cmd/ctr/commands"
"github.com/containerd/imgcrypt/cmd/ctr/commands/images"

Expand Down
6 changes: 3 additions & 3 deletions cmd/ctr/commands/run/run_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ import (
containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/pkg/netns"
"github.com/containerd/containerd/v2/pkg/oci"
"github.com/containerd/imgcrypt"
"github.com/containerd/imgcrypt/cmd/ctr/commands"
"github.com/containerd/imgcrypt/cmd/ctr/commands/images"
"github.com/containerd/imgcrypt/images/encryption"
"github.com/containerd/imgcrypt/images/encryption/parsehelpers"
"github.com/containerd/imgcrypt/v2"
"github.com/containerd/imgcrypt/v2/images/encryption"
"github.com/containerd/imgcrypt/v2/images/encryption/parsehelpers"

specs "github.com/opencontainers/runtime-spec/specs-go"
"github.com/sirupsen/logrus"
Expand Down
4 changes: 2 additions & 2 deletions cmd/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ require (
github.com/containerd/containerd/v2 v2.0.0-rc.6
github.com/containerd/errdefs v0.3.0
github.com/containerd/go-cni v1.1.10
github.com/containerd/imgcrypt v1.2.0-rc1
github.com/containerd/imgcrypt/v2 v2.0.0
github.com/containerd/log v0.1.0
github.com/containerd/platforms v0.2.1
github.com/containerd/typeurl/v2 v2.2.0
Expand Down Expand Up @@ -92,4 +92,4 @@ require (
tags.cncf.io/container-device-interface/specs-go v0.8.0 // indirect
)

replace github.com/containerd/imgcrypt => ../
replace github.com/containerd/imgcrypt/v2 => ../
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/containerd/imgcrypt
module github.com/containerd/imgcrypt/v2

go 1.22.0

Expand Down
3 changes: 2 additions & 1 deletion images/encryption/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,10 @@ import (
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/core/diff"
"github.com/containerd/errdefs"
"github.com/containerd/imgcrypt"
"github.com/containerd/typeurl/v2"

"github.com/containerd/imgcrypt/v2"

encconfig "github.com/containers/ocicrypt/config"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
)
Expand Down
Loading