From cbe354b12ae2d59fcb5b686087a3256b5ed1c977 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 29 Jun 2022 15:54:30 +0200 Subject: [PATCH] vendor.mod: group replace rules Signed-off-by: Sebastiaan van Stijn --- vendor.mod | 22 ++++++++++++---------- vendor/modules.txt | 2 +- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/vendor.mod b/vendor.mod index fd50cbd84f..44d8e1e98d 100644 --- a/vendor.mod +++ b/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 +) diff --git a/vendor/modules.txt b/vendor/modules.txt index 318e46fe99..9b85671a69 100644 --- a/vendor/modules.txt +++ b/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