Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Hepto
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ACIDES
Hepto
Commits
d4228e34
Commit
d4228e34
authored
1 year ago
by
kaiyou
Browse files
Options
Downloads
Patches
Plain Diff
Fix an issue with import orderings and containerd
See:
https://github.com/containerd/containerd/issues/8984
parent
b999f8d4
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Pipeline
#27627
passed
1 year ago
Stage: build
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
services/containerd.go
+5
-1
5 additions, 1 deletion
services/containerd.go
with
5 additions
and
1 deletion
services/containerd.go
+
5
−
1
View file @
d4228e34
...
...
@@ -15,7 +15,6 @@ import (
_
"github.com/containerd/containerd/metadata/plugin"
_
"github.com/containerd/containerd/metrics/cgroups"
"github.com/containerd/containerd/mount"
_
"github.com/containerd/containerd/pkg/cri"
"github.com/containerd/containerd/plugin"
_
"github.com/containerd/containerd/plugins/sandbox"
_
"github.com/containerd/containerd/runtime/restart/monitor"
...
...
@@ -40,6 +39,11 @@ import (
_
"github.com/containerd/containerd/snapshots/overlay/plugin"
"github.com/containerd/containerd/sys"
"github.com/sirupsen/logrus"
// Explicitely import the CRI plugin last, so that we do not
// trigger a bug related to plugin ordering, this comment is meant for
// gofmt to not reorder the following line
// See: https://github.com/containerd/containerd/issues/8984
_
"github.com/containerd/containerd/pkg/cri"
)
const
(
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment