diff --git a/cmd/serve/main.go b/cmd/serve/main.go index 80a58592..395464e3 100644 --- a/cmd/serve/main.go +++ b/cmd/serve/main.go @@ -12,8 +12,8 @@ import ( "syscall" "time" - "github.com/moby/moby/libnetwork/resolvconf" - "github.com/moby/moby/libnetwork/types" + "github.com/docker/docker/libnetwork/resolvconf" + "github.com/docker/docker/libnetwork/types" "github.com/freifunkMUC/wg-embed/pkg/wgembed" "github.com/gorilla/mux" "github.com/pkg/errors" diff --git a/go.mod b/go.mod index cf15e295..8c092193 100644 --- a/go.mod +++ b/go.mod @@ -8,6 +8,7 @@ require ( github.com/alecthomas/kingpin/v2 v2.4.0 github.com/coreos/go-iptables v0.7.0 github.com/coreos/go-oidc/v3 v3.10.0 + github.com/docker/docker v26.1.0+incompatible github.com/freifunkMUC/pg-events v0.4.4 github.com/freifunkMUC/wg-embed v0.10.3 github.com/google/uuid v1.6.0 @@ -17,7 +18,6 @@ require ( github.com/improbable-eng/grpc-web v0.15.0 github.com/jinzhu/gorm v1.9.16 github.com/miekg/dns v1.1.59 - github.com/moby/moby v26.1.0+incompatible github.com/patrickmn/go-cache v2.1.0+incompatible github.com/pkg/errors v0.9.1 github.com/sirupsen/logrus v1.9.3 @@ -41,7 +41,6 @@ require ( github.com/containerd/log v0.1.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect - github.com/docker/docker v26.1.0+incompatible // indirect github.com/go-jose/go-jose/v4 v4.0.1 // indirect github.com/go-sql-driver/mysql v1.8.1 // indirect github.com/golang/protobuf v1.5.4 // indirect diff --git a/go.sum b/go.sum index 0c2ab46d..250a41e3 100644 --- a/go.sum +++ b/go.sum @@ -276,8 +276,6 @@ github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS4 github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/moby/moby v26.1.0+incompatible h1:mjepCwMH0KpCgPvrXjqqyCeTCHgzO7p9TwZ2nQMI2qU= -github.com/moby/moby v26.1.0+incompatible/go.mod h1:fDXVQ6+S340veQPv35CzDahGBmHsiclFwfEygB/TWMc= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=