Browse Source

vendor.mod: group replace rules

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sebastiaan van Stijn 3 years ago
parent
commit
cbe354b12a
2 changed files with 13 additions and 11 deletions
  1. 12 10
      vendor.mod
  2. 1 1
      vendor/modules.txt

+ 12 - 10
vendor.mod

@@ -164,13 +164,15 @@ require (
 	google.golang.org/protobuf v1.27.1 // indirect
 )
 
-replace github.com/armon/go-radix => github.com/armon/go-radix v0.0.0-20150105235045-e39d623f12e8
-
-// Removes etcd dependency
-replace github.com/rexray/gocsi => github.com/dperny/gocsi v1.2.3-pre
-
-// Resolve dependency hell with github.com/cloudflare/cfssl (transitive via
-// swarmkit) by pinning the certificate-transparency-go version. Remove once
-// module go.etcd.io/etcd/server/v3 has upgraded its dependency on
-// go.opentelemetry.io/otel to v1.
-replace github.com/google/certificate-transparency-go => github.com/google/certificate-transparency-go v1.0.20
+replace (
+	// More recent versions result in a panic in libnetwork.
+	// FIXME(thaJeztah): we need to fix how we use this library or replace it; see https://github.com/moby/moby/issues/43753
+	github.com/armon/go-radix => github.com/armon/go-radix v0.0.0-20150105235045-e39d623f12e8
+	// Resolve dependency hell with github.com/cloudflare/cfssl (transitive via
+	// swarmkit) by pinning the certificate-transparency-go version. Remove once
+	// module go.etcd.io/etcd/server/v3 has upgraded its dependency on
+	// go.opentelemetry.io/otel to v1.
+	github.com/google/certificate-transparency-go => github.com/google/certificate-transparency-go v1.0.20
+	// Removes etcd dependency
+	github.com/rexray/gocsi => github.com/dperny/gocsi v1.2.3-pre
+)

+ 1 - 1
vendor/modules.txt

@@ -1113,5 +1113,5 @@ gotest.tools/v3/internal/source
 gotest.tools/v3/poll
 gotest.tools/v3/skip
 # github.com/armon/go-radix => github.com/armon/go-radix v0.0.0-20150105235045-e39d623f12e8
-# github.com/rexray/gocsi => github.com/dperny/gocsi v1.2.3-pre
 # github.com/google/certificate-transparency-go => github.com/google/certificate-transparency-go v1.0.20
+# github.com/rexray/gocsi => github.com/dperny/gocsi v1.2.3-pre