Skip to content

update containerd (1.7.7), slirp4netns (1.2.2), containerd-fuse-overlayfs (1.0.7), Kubo (0.23.0) #2556

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

Merged
AkihiroSuda merged 6 commits into from
Oct 10, 2023
Merged

update containerd (1.7.7), slirp4netns (1.2.2), containerd-fuse-overlayfs (1.0.7), Kubo (0.23.0) #2556

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
abec5ef
containerd/containerd/log -> containerd/log
AkihiroSuda Oct 9, 2023
ea86ea8
update containerd (1.7.7)
AkihiroSuda Oct 9, 2023
869dec8
update slirp4netns (1.2.2)
AkihiroSuda Oct 9, 2023
02a59fc
update containerd-fuse-overlayfs (1.0.7)
AkihiroSuda Oct 9, 2023
98d5724
update Kubo (0.23.0)
AkihiroSuda Oct 9, 2023
e590756
update gotestsum (1.10.0)
AkihiroSuda Oct 9, 2023
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
Next Next commit
containerd/containerd/log -> containerd/log 
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
  • Loading branch information
@AkihiroSuda
AkihiroSuda committed Oct 9, 2023
commit abec5ef0d0376dd76d9d4bbe9f2d8161b814fec4
2 changes: 1 addition & 1 deletion cmd/nerdctl/container_update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (
"github.com/containerd/containerd"
"github.com/containerd/containerd/containers"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/log"
"github.com/containerd/containerd/pkg/cri/util"
"github.com/containerd/log"
"github.com/containerd/nerdctl/pkg/api/types"
"github.com/containerd/nerdctl/pkg/clientutil"
nerdctlContainer "github.com/containerd/nerdctl/pkg/cmd/container"
Expand Down
1 change: 1 addition & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ require (
github.com/containerd/continuity v0.4.2
github.com/containerd/go-cni v1.1.9
github.com/containerd/imgcrypt v1.1.8
github.com/containerd/log v0.1.0
github.com/containerd/nydus-snapshotter v0.13.1
github.com/containerd/stargz-snapshotter v0.14.3
github.com/containerd/stargz-snapshotter/estargz v0.14.3
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ github.com/containerd/go-cni v1.1.9 h1:ORi7P1dYzCwVM6XPN4n3CbkuOx/NZ2DOqy+SHRdo9
github.com/containerd/go-cni v1.1.9/go.mod h1:XYrZJ1d5W6E2VOvjffL3IZq0Dz6bsVlERHbekNK90PM=
github.com/containerd/imgcrypt v1.1.8 h1:ZS7TuywcRNLoHpU0g+v4/PsKynl6TYlw5xDVWWoIyFA=
github.com/containerd/imgcrypt v1.1.8/go.mod h1:x6QvFIkMyO2qGIY2zXc88ivEzcbgvLdWjoZyGqDap5U=
github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
github.com/containerd/nydus-snapshotter v0.13.1 h1:5XNkCZ9ivLXCcyx3Jbbfh/fntkcls69uBg0x9VE8zlk=
github.com/containerd/nydus-snapshotter v0.13.1/go.mod h1:XWAz9ytsjBuKPVXDKP3xoMlcSKNsGnjXlEup6DuzUIo=
github.com/containerd/stargz-snapshotter v0.14.3 h1:OTUVZoPSPs8mGgmQUE1dqw3WX/3nrsmsurW7UPLWl1U=
Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/namespace/remove.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (

"github.com/containerd/containerd"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/log"
"github.com/containerd/log"
"github.com/containerd/nerdctl/pkg/api/types"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/system/events.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
"github.com/containerd/containerd"
_ "github.com/containerd/containerd/api/events" // Register grpc event types
"github.com/containerd/containerd/events"
"github.com/containerd/containerd/log"
"github.com/containerd/log"
"github.com/containerd/nerdctl/pkg/api/types"
"github.com/containerd/nerdctl/pkg/formatter"
"github.com/containerd/typeurl/v2"
Expand Down
2 changes: 1 addition & 1 deletion pkg/consoleutil/consoleutil_unix.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"os/signal"

"github.com/containerd/console"
"github.com/containerd/containerd/log"
"github.com/containerd/log"
"golang.org/x/sys/unix"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/consoleutil/consoleutil_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"time"

"github.com/containerd/console"
"github.com/containerd/containerd/log"
"github.com/containerd/log"
)

// HandleConsoleResize resizes the console.
Expand Down
2 changes: 1 addition & 1 deletion pkg/imgutil/jobs/jobs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ import (

"github.com/containerd/containerd/content"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/log"
"github.com/containerd/containerd/pkg/progress"
"github.com/containerd/containerd/remotes"
"github.com/containerd/log"
"github.com/opencontainers/go-digest"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/imgutil/pull/pull.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (

"github.com/containerd/containerd"
"github.com/containerd/containerd/images"
"github.com/containerd/containerd/log"
"github.com/containerd/containerd/remotes"
"github.com/containerd/log"
"github.com/containerd/nerdctl/pkg/imgutil/jobs"
"github.com/containerd/nerdctl/pkg/platformutil"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
Expand Down
2 changes: 1 addition & 1 deletion pkg/imgutil/push/push.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ import (

"github.com/containerd/containerd"
"github.com/containerd/containerd/images"
"github.com/containerd/containerd/log"
"github.com/containerd/containerd/pkg/progress"
"github.com/containerd/containerd/platforms"
"github.com/containerd/containerd/remotes"
"github.com/containerd/containerd/remotes/docker"
"github.com/containerd/log"
"github.com/containerd/nerdctl/pkg/imgutil/jobs"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"

Expand Down
2 changes: 1 addition & 1 deletion pkg/logging/cri_logger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import (
"path/filepath"
"time"

"github.com/containerd/containerd/log"
"github.com/containerd/log"
"github.com/containerd/nerdctl/pkg/logging/tail"
"github.com/sirupsen/logrus"
)
Expand Down