Merge pull request #45216 from corhere/backport-20.10/containerd-fifo…

…_v1.1 [20.10 backport] Upgrade containerd/fifo to v1.1.0
moby · Mar 29, 2023 · 83679bb · 83679bb
2 parents b4f0442 + a9c02c2
commit 83679bb
Show file tree

Hide file tree

Showing 10 changed files with 69 additions and 72 deletions.
diff --git a/vendor.conf b/vendor.conf
@@ -135,7 +135,7 @@ google.golang.org/genproto                          3f1135a288c9a07e340ae8ba4cc6
 
 # containerd
 github.com/containerd/containerd                    96c5ae04b6784e180aaeee50fba715ac448ddb0d https://github.com/moby/containerd.git # docker-20.10 branch
-github.com/containerd/fifo                          0724c46b320cf96bb172a0550c19a4b1fca4dacb
+github.com/containerd/fifo                          151b205263c29d471e0d55c787d2ce9f5343fd46 # v1.1.0
 github.com/containerd/continuity                    5ad51c7aca47b8e742f5e6e7dc841d50f5f6affd # v0.3.0
 github.com/containerd/cgroups                       b9de8a2212026c07cec67baf3323f1fc0121e048 # v1.0.1
 github.com/containerd/console                       2f1e3d2b6afd18e8b2077816c711205a0b4d8769 # v1.0.2

diff --git a/vendor/github.com/containerd/fifo/errors.go b/vendor/github.com/containerd/fifo/errors.go
diff --git a/vendor/github.com/containerd/fifo/fifo.go b/vendor/github.com/containerd/fifo/fifo.go
diff --git a/vendor/github.com/containerd/fifo/go.mod b/vendor/github.com/containerd/fifo/go.mod
diff --git a/vendor/github.com/containerd/fifo/handle_linux.go b/vendor/github.com/containerd/fifo/handle_linux.go
diff --git a/vendor/github.com/containerd/fifo/handle_nolinux.go b/vendor/github.com/containerd/fifo/handle_nolinux.go
diff --git a/vendor/github.com/containerd/fifo/mkfifo_solaris.go b/vendor/github.com/containerd/fifo/mkfifo_solaris.go
diff --git a/vendor/github.com/containerd/fifo/raw.go b/vendor/github.com/containerd/fifo/raw.go
diff --git a/vendor/github.com/containerd/fifo/readme.md b/vendor/github.com/containerd/fifo/readme.md
diff --git a/...b.com/containerd/fifo/mkfifo_nosolaris.go → vendor/github.com/containerd/fifo/utils.go b/...b.com/containerd/fifo/mkfifo_nosolaris.go → vendor/github.com/containerd/fifo/utils.go