Skip to content

Commit

Permalink
Update to containerd v2.0.0-rc.2
Browse files Browse the repository at this point in the history 
Signed-off-by: Derek McGowan <derek@mcg.dev>
  • Loading branch information
@dmcgowan
dmcgowan committed May 27, 2024
1 parent 2755039 commit 8b9b205
Show file tree
Hide file tree
Showing 6 changed files with 109 additions and 98 deletions.
4 changes: 2 additions & 2 deletions cmd/ctd-decoder/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (
"github.com/containerd/imgcrypt/images/encryption"
"github.com/containerd/typeurl/v2"

"github.com/containerd/containerd/v2/protobuf/proto"
"github.com/containerd/containerd/v2/protobuf/types"
"github.com/containerd/containerd/v2/pkg/protobuf/proto"
"github.com/containerd/containerd/v2/pkg/protobuf/types"
"github.com/urfave/cli/v2"
)

Expand Down
9 changes: 5 additions & 4 deletions cmd/ctr/commands/run/run_unix.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,22 +28,23 @@ import (
"strconv"
"strings"

"github.com/containerd/containerd/api/types/runc/options"
runtimeoptions "github.com/containerd/containerd/api/types/runtimeoptions/v1"
containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/contrib/apparmor"
"github.com/containerd/containerd/v2/contrib/nvidia"
"github.com/containerd/containerd/v2/contrib/seccomp"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/core/runtime/v2/runc/options"
"github.com/containerd/containerd/v2/core/snapshots"
"github.com/containerd/containerd/v2/pkg/oci"
runtimeoptions "github.com/containerd/containerd/v2/pkg/runtimeoptions/v1"
"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/platforms"

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

"github.com/opencontainers/runtime-spec/specs-go"
"github.com/sirupsen/logrus"
"github.com/urfave/cli/v2"
Expand Down
39 changes: 21 additions & 18 deletions cmd/go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,27 @@
module github.com/containerd/imgcrypt/cmd

go 1.21
go 1.22.0

toolchain go1.22.3

require (
github.com/Microsoft/go-winio v0.6.2
github.com/Microsoft/hcsshim v0.12.3
github.com/containerd/console v1.0.4
github.com/containerd/containerd/v2 v2.0.0-rc.1
github.com/containerd/containerd/api v1.8.0-rc.0
github.com/containerd/containerd/v2 v2.0.0-rc.2
github.com/containerd/errdefs v0.1.0
github.com/containerd/go-cni v1.1.9
github.com/containerd/imgcrypt v1.1.7
github.com/containerd/log v0.1.0
github.com/containerd/platforms v0.1.1
github.com/containerd/platforms v0.2.0
github.com/containerd/typeurl/v2 v2.1.1
github.com/containers/ocicrypt v1.1.10
github.com/opencontainers/go-digest v1.0.0
github.com/opencontainers/image-spec v1.1.0
github.com/opencontainers/runtime-spec v1.2.0
github.com/sirupsen/logrus v1.9.3
github.com/urfave/cli/v2 v2.27.1
github.com/urfave/cli/v2 v2.27.2
golang.org/x/sync v0.7.0
google.golang.org/grpc v1.63.2
)
Expand All @@ -33,11 +36,11 @@ require (
github.com/containerd/fifo v1.1.0 // indirect
github.com/containerd/go-runc v1.1.0 // indirect
github.com/containerd/plugin v0.1.0 // indirect
github.com/containerd/ttrpc v1.2.3 // indirect
github.com/containerd/ttrpc v1.2.4 // indirect
github.com/containernetworking/cni v1.2.0 // indirect
github.com/containernetworking/plugins v1.4.1 // indirect
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
github.com/distribution/reference v0.6.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
Expand All @@ -62,27 +65,27 @@ require (
github.com/moby/sys/user v0.1.0 // indirect
github.com/opencontainers/runtime-tools v0.9.1-0.20221107090550-2e043c6bd626 // indirect
github.com/opencontainers/selinux v1.11.0 // indirect
github.com/pelletier/go-toml/v2 v2.2.1 // indirect
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980 // indirect
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913 // indirect
go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.50.0 // indirect
go.opentelemetry.io/otel v1.25.0 // indirect
go.opentelemetry.io/otel/metric v1.25.0 // indirect
go.opentelemetry.io/otel/trace v1.25.0 // indirect
golang.org/x/crypto v0.21.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.51.0 // indirect
go.opentelemetry.io/otel v1.26.0 // indirect
go.opentelemetry.io/otel/metric v1.26.0 // indirect
go.opentelemetry.io/otel/trace v1.26.0 // indirect
golang.org/x/crypto v0.22.0 // indirect
golang.org/x/exp v0.0.0-20231214170342-aacd6d4b4611 // indirect
golang.org/x/mod v0.17.0 // indirect
golang.org/x/net v0.23.0 // indirect
golang.org/x/sys v0.19.0 // indirect
golang.org/x/term v0.18.0 // indirect
golang.org/x/net v0.24.0 // indirect
golang.org/x/sys v0.20.0 // indirect
golang.org/x/term v0.19.0 // indirect
golang.org/x/text v0.14.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda // indirect
google.golang.org/protobuf v1.33.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be // indirect
google.golang.org/protobuf v1.34.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
Expand Down
Loading

0 comments on commit 8b9b205

Please sign in to comment.