github.com/kaisenlinux/docker.io@v0.0.0-20230510090727-ea55db55fac7/debian/patches/avoid-consul.patch (about)

     1  Index: docker/libnetwork/store.go
     2  ===================================================================
     3  --- docker.orig/libnetwork/store.go
     4  +++ docker/libnetwork/store.go
     5  @@ -5,7 +5,6 @@ import (
     6   	"strings"
     7   
     8   	"github.com/docker/libkv/store/boltdb"
     9  -	"github.com/docker/libkv/store/consul"
    10   	"github.com/docker/libkv/store/etcd"
    11   	"github.com/docker/libkv/store/zookeeper"
    12   	"github.com/docker/libnetwork/datastore"
    13  @@ -13,7 +12,6 @@ import (
    14   )
    15   
    16   func registerKVStores() {
    17  -	consul.Register()
    18   	zookeeper.Register()
    19   	etcd.Register()
    20   	boltdb.Register()
    21  Index: docker/engine/pkg/discovery/kv/kv.go
    22  ===================================================================
    23  --- docker.orig/engine/pkg/discovery/kv/kv.go
    24  +++ docker/engine/pkg/discovery/kv/kv.go
    25  @@ -10,7 +10,6 @@ import (
    26   	"github.com/docker/go-connections/tlsconfig"
    27   	"github.com/docker/libkv"
    28   	"github.com/docker/libkv/store"
    29  -	"github.com/docker/libkv/store/consul"
    30   	"github.com/docker/libkv/store/etcd"
    31   	"github.com/docker/libkv/store/zookeeper"
    32   	"github.com/sirupsen/logrus"
    33  @@ -38,12 +37,10 @@ func init() {
    34   func Init() {
    35   	// Register to libkv
    36   	zookeeper.Register()
    37  -	consul.Register()
    38   	etcd.Register()
    39   
    40   	// Register to internal discovery service
    41   	discovery.Register("zk", &Discovery{backend: store.ZK})
    42  -	discovery.Register("consul", &Discovery{backend: store.CONSUL})
    43   	discovery.Register("etcd", &Discovery{backend: store.ETCD})
    44   }
    45   
    46  Index: docker/libnetwork/hostdiscovery/hostdiscovery.go
    47  ===================================================================
    48  --- docker.orig/libnetwork/hostdiscovery/hostdiscovery.go
    49  +++ docker/libnetwork/hostdiscovery/hostdiscovery.go
    50  @@ -10,7 +10,6 @@ import (
    51   	"github.com/docker/docker/pkg/discovery"
    52   	// Including KV
    53   	_ "github.com/docker/docker/pkg/discovery/kv"
    54  -	"github.com/docker/libkv/store/consul"
    55   	"github.com/docker/libkv/store/etcd"
    56   	"github.com/docker/libkv/store/zookeeper"
    57   	"github.com/docker/libnetwork/types"
    58  @@ -24,7 +23,6 @@ type hostDiscovery struct {
    59   }
    60   
    61   func init() {
    62  -	consul.Register()
    63   	etcd.Register()
    64   	zookeeper.Register()
    65   }