From 42ef2c5036f5131fbabf7389ac7efa049cd63cd2 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 8 Apr 2021 15:47:08 +0200 Subject: [PATCH] vendor: github.com/containerd/containerd 55eda46b22f985cde99b599e469ff9c13994bf68 This patch picks the first commit in containerd that exports the AppArmor package functions to keep the vendor diff small (there are some updates to that package after this, but those will be included in other patches). full diff: https://github.com/containerd/containerd/compare/fbf1a72de7da110187b7d3dace433914b9beca10...55eda46b22f985cde99b599e469ff9c13994bf68 Signed-off-by: Sebastiaan van Stijn --- vendor.conf | 2 +- .../github.com/containerd/containerd/reference/reference.go | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/vendor.conf b/vendor.conf index 54e699e114..e2a3186c7b 100644 --- a/vendor.conf +++ b/vendor.conf @@ -130,7 +130,7 @@ github.com/googleapis/gax-go bd5b16380fd03dc758d11cef74ba google.golang.org/genproto 3f1135a288c9a07e340ae8ba4cc6c7065a3160e8 # containerd -github.com/containerd/containerd fbf1a72de7da110187b7d3dace433914b9beca10 # master (v1.5.0-dev) +github.com/containerd/containerd 55eda46b22f985cde99b599e469ff9c13994bf68 # master (v1.5.0-dev) github.com/containerd/fifo 0724c46b320cf96bb172a0550c19a4b1fca4dacb github.com/containerd/continuity efbc4488d8fe1bdc16bde3b2d2990d9b3a899165 github.com/containerd/cgroups 0b889c03f102012f1d93a97ddd3ef71cd6f4f510 diff --git a/vendor/github.com/containerd/containerd/reference/reference.go b/vendor/github.com/containerd/containerd/reference/reference.go index 562ab0d491..a4bf6da601 100644 --- a/vendor/github.com/containerd/containerd/reference/reference.go +++ b/vendor/github.com/containerd/containerd/reference/reference.go @@ -85,6 +85,10 @@ var splitRe = regexp.MustCompile(`[:@]`) // Parse parses the string into a structured ref. func Parse(s string) (Spec, error) { + if strings.Contains(s, "://") { + return Spec{}, ErrInvalid + } + u, err := url.Parse("dummy://" + s) if err != nil { return Spec{}, err