Skip to content

Commit 1c03c37

Browse files
thaJeztahthaJeztah
committed
go.mod: github.com/containerd/fifo v1.0.0
full diff: containerd/fifo@115abcc...v1.0.0 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
1 parent bbbd851 commit 1c03c37

File tree

14 files changed

+23
-74
lines changed

14 files changed

+23
-74
lines changed

‎container.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import (
3232
"github.com/containerd/containerd/images"
3333
"github.com/containerd/containerd/oci"
3434
"github.com/containerd/containerd/runtime/v2/runc/options"
35-
"github.com/containerd/containerd/sys"
35+
"github.com/containerd/fifo"
3636
"github.com/containerd/typeurl"
3737
prototypes "github.com/gogo/protobuf/types"
3838
ver "github.com/opencontainers/image-spec/specs-go"
@@ -435,12 +435,12 @@ func loadFifos(response *tasks.GetResponse) *cio.FIFOSet {
435435
err error
436436
dirs = map[string]struct{}{}
437437
)
438-
for _, fifo := range fifos {
439-
if isFifo, _ := sys.IsFifo(fifo); isFifo {
440-
if rerr := os.Remove(fifo); err == nil {
438+
for _, f := range fifos {
439+
if isFifo, _ := fifo.IsFifo(f); isFifo {
440+
if rerr := os.Remove(f); err == nil {
441441
err = rerr
442442
}
443-
dirs[filepath.Dir(fifo)] = struct{}{}
443+
dirs[filepath.Dir(f)] = struct{}{}
444444
}
445445
}
446446
for dir := range dirs {

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ require (
1010
github.com/containerd/cgroups v0.0.0-20210114181951-8a68de567b68
1111
github.com/containerd/console v1.0.2
1212
github.com/containerd/continuity v0.0.0-20210208174643-50096c924a4e
13-
github.com/containerd/fifo v0.0.0-20210316144830-115abcc95a1d
13+
github.com/containerd/fifo v1.0.0
1414
github.com/containerd/go-cni v1.0.2
1515
github.com/containerd/go-runc v0.0.0-20201020171139-16b287bc67d0
1616
github.com/containerd/imgcrypt v1.1.1

‎go.sum‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,9 @@ github.com/containerd/fifo v0.0.0-20180307165137-3d5202aec260/go.mod h1:ODA38xgv
136136
github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448/go.mod h1:ODA38xgv3Kuk8dQz2ZQXpnv/UZZUHUCL7pnLehbXgQI=
137137
github.com/containerd/fifo v0.0.0-20200410184934-f15a3290365b/go.mod h1:jPQ2IAeZRCYxpS/Cm1495vGFww6ecHmMk1YJH2Q5ln0=
138138
github.com/containerd/fifo v0.0.0-20201026212402-0724c46b320c/go.mod h1:jPQ2IAeZRCYxpS/Cm1495vGFww6ecHmMk1YJH2Q5ln0=
139-
github.com/containerd/fifo v0.0.0-20210316144830-115abcc95a1d h1:u6sWqdNGAy7+O8qG/r1dqdnZE7IdEjteK3WGuvbfreo=
140139
github.com/containerd/fifo v0.0.0-20210316144830-115abcc95a1d/go.mod h1:ocF/ME1SX5b1AOlWi9r677YJmCPSwwWnQ9O123vzpE4=
140+
github.com/containerd/fifo v1.0.0 h1:6PirWBr9/L7GDamKr+XM0IeUFXu5mf3M/BPpH9gaLBU=
141+
github.com/containerd/fifo v1.0.0/go.mod h1:ocF/ME1SX5b1AOlWi9r677YJmCPSwwWnQ9O123vzpE4=
141142
github.com/containerd/go-cni v1.0.1/go.mod h1:+vUpYxKvAF72G9i1WoDOiPGRtQpqsNW/ZHtSlv++smU=
142143
github.com/containerd/go-cni v1.0.2 h1:YbJAhpTevL2v6u8JC1NhCYRwf+3Vzxcc5vGnYoJ7VeE=
143144
github.com/containerd/go-cni v1.0.2/go.mod h1:nrNABBHzu0ZwCug9Ije8hL2xBCYh/pjfMb1aZGrrohk=

‎integration/client/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ github.com/containerd/console v1.0.2 h1:Pi6D+aZXM+oUw1czuKgH5IJ+y0jhYcwBJfx5/Ghn
8080
github.com/containerd/console v1.0.2/go.mod h1:ytZPjGgY2oeTkAONYafi2kSj0aYggsf8acV1PGKCbzQ=
8181
github.com/containerd/continuity v0.0.0-20210208174643-50096c924a4e h1:6JKvHHt396/qabvMhnhUZvWaHZzfVfldxE60TK8YLhg=
8282
github.com/containerd/continuity v0.0.0-20210208174643-50096c924a4e/go.mod h1:EXlVlkqNba9rJe3j7w3Xa924itAMLgZH4UD/Q4PExuQ=
83-
github.com/containerd/fifo v0.0.0-20210316144830-115abcc95a1d h1:u6sWqdNGAy7+O8qG/r1dqdnZE7IdEjteK3WGuvbfreo=
84-
github.com/containerd/fifo v0.0.0-20210316144830-115abcc95a1d/go.mod h1:ocF/ME1SX5b1AOlWi9r677YJmCPSwwWnQ9O123vzpE4=
83+
github.com/containerd/fifo v1.0.0 h1:6PirWBr9/L7GDamKr+XM0IeUFXu5mf3M/BPpH9gaLBU=
84+
github.com/containerd/fifo v1.0.0/go.mod h1:ocF/ME1SX5b1AOlWi9r677YJmCPSwwWnQ9O123vzpE4=
8585
github.com/containerd/go-cni v1.0.2/go.mod h1:nrNABBHzu0ZwCug9Ije8hL2xBCYh/pjfMb1aZGrrohk=
8686
github.com/containerd/go-runc v0.0.0-20200220073739-7016d3ce2328/go.mod h1:PpyHrqVs8FTi9vpyHwPwiNEGaACDxT/N/pLcvMSRA9g=
8787
github.com/containerd/go-runc v0.0.0-20201020171139-16b287bc67d0 h1:e+50zk22gvHLJKe8+d+xSMyA88PPQk/XfWuUw1BdnPA=

‎pkg/process/io.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ import (
3434
"github.com/containerd/containerd/log"
3535
"github.com/containerd/containerd/namespaces"
3636
"github.com/containerd/containerd/pkg/stdio"
37-
"github.com/containerd/containerd/sys"
3837
"github.com/containerd/fifo"
3938
runc "github.com/containerd/go-runc"
4039
"github.com/hashicorp/go-multierror"
@@ -179,7 +178,7 @@ func copyPipes(ctx context.Context, rio runc.IO, stdin, stdout, stderr string, w
179178
},
180179
},
181180
} {
182-
ok, err := sys.IsFifo(i.name)
181+
ok, err := fifo.IsFifo(i.name)
183182
if err != nil {
184183
return err
185184
}

‎vendor/github.com/containerd/fifo/.gitattributes‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/fifo/errors.go‎

Lines changed: 1 addition & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/fifo/fifo.go‎

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/fifo/handle_nolinux.go‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/fifo/mkfifo_nosolaris.go‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)