From 1eaea43581b63657a0552b4cb6a525390bd0d4db Mon Sep 17 00:00:00 2001 From: CrazyMax Date: Mon, 26 Dec 2022 09:52:51 +0100 Subject: [PATCH] fix protos and "go generate" commands Signed-off-by: CrazyMax --- api/types/swarm/runtime/gen.go | 2 +- api/types/swarm/runtime/plugin.proto | 2 -- libnetwork/agent.go | 2 +- libnetwork/agent.proto | 2 +- libnetwork/drivers/overlay/overlay.go | 2 +- libnetwork/drivers/overlay/overlay.proto | 2 +- libnetwork/drivers/windows/overlay/overlay.proto | 2 +- libnetwork/drivers/windows/overlay/overlay_windows.go | 2 +- libnetwork/networkdb/networkdb.go | 2 +- libnetwork/networkdb/networkdb.proto | 2 +- 10 files changed, 9 insertions(+), 11 deletions(-) diff --git a/api/types/swarm/runtime/gen.go b/api/types/swarm/runtime/gen.go index 98c2806c31..44c680835e 100644 --- a/api/types/swarm/runtime/gen.go +++ b/api/types/swarm/runtime/gen.go @@ -1,3 +1,3 @@ -//go:generate protoc -I . --gogofast_out=import_path=github.com/docker/docker/api/types/swarm/runtime:. plugin.proto +//go:generate protoc --gogofast_out=import_path=github.com/docker/docker/api/types/swarm/runtime:. plugin.proto package runtime // import "github.com/docker/docker/api/types/swarm/runtime" diff --git a/api/types/swarm/runtime/plugin.proto b/api/types/swarm/runtime/plugin.proto index 9ef169046b..e311b36ba2 100644 --- a/api/types/swarm/runtime/plugin.proto +++ b/api/types/swarm/runtime/plugin.proto @@ -1,7 +1,5 @@ syntax = "proto3"; -option go_package = "github.com/docker/docker/api/types/swarm/runtime;runtime"; - // PluginSpec defines the base payload which clients can specify for creating // a service with the plugin runtime. message PluginSpec { diff --git a/libnetwork/agent.go b/libnetwork/agent.go index 962dc57a59..0f78c54a8f 100644 --- a/libnetwork/agent.go +++ b/libnetwork/agent.go @@ -1,6 +1,6 @@ package libnetwork -//go:generate protoc -I.:Godeps/_workspace/src/github.com/gogo/protobuf --gogo_out=import_path=github.com/docker/docker/libnetwork,Mgogoproto/gogo.proto=github.com/gogo/protobuf/gogoproto:. agent.proto +//go:generate protoc -I=. -I=../vendor/ --gogo_out=import_path=github.com/docker/docker/libnetwork:. agent.proto import ( "encoding/json" diff --git a/libnetwork/agent.proto b/libnetwork/agent.proto index f9c46c7a98..05c6419c14 100644 --- a/libnetwork/agent.proto +++ b/libnetwork/agent.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -import "gogoproto/gogo.proto"; +import "github.com/gogo/protobuf/gogoproto/gogo.proto"; package libnetwork; diff --git a/libnetwork/drivers/overlay/overlay.go b/libnetwork/drivers/overlay/overlay.go index ab77a714e8..dc1e63ae1d 100644 --- a/libnetwork/drivers/overlay/overlay.go +++ b/libnetwork/drivers/overlay/overlay.go @@ -2,7 +2,7 @@ package overlay -//go:generate protoc -I.:../../Godeps/_workspace/src/github.com/gogo/protobuf --gogo_out=import_path=github.com/docker/docker/libnetwork/drivers/overlay,Mgogoproto/gogo.proto=github.com/gogo/protobuf/gogoproto:. overlay.proto +//go:generate protoc -I=. -I=../../../vendor/ --gogo_out=import_path=github.com/docker/docker/libnetwork/drivers/overlay:. overlay.proto import ( "fmt" diff --git a/libnetwork/drivers/overlay/overlay.proto b/libnetwork/drivers/overlay/overlay.proto index 3133386e03..cfdf242851 100644 --- a/libnetwork/drivers/overlay/overlay.proto +++ b/libnetwork/drivers/overlay/overlay.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -import "gogoproto/gogo.proto"; +import "github.com/gogo/protobuf/gogoproto/gogo.proto"; package overlay; diff --git a/libnetwork/drivers/windows/overlay/overlay.proto b/libnetwork/drivers/windows/overlay/overlay.proto index 45b8c9de7e..73f4a03d1e 100644 --- a/libnetwork/drivers/windows/overlay/overlay.proto +++ b/libnetwork/drivers/windows/overlay/overlay.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -import "gogoproto/gogo.proto"; +import "github.com/gogo/protobuf/gogoproto/gogo.proto"; package overlay; diff --git a/libnetwork/drivers/windows/overlay/overlay_windows.go b/libnetwork/drivers/windows/overlay/overlay_windows.go index 19e11a25b6..e44d2ea9ff 100644 --- a/libnetwork/drivers/windows/overlay/overlay_windows.go +++ b/libnetwork/drivers/windows/overlay/overlay_windows.go @@ -1,6 +1,6 @@ package overlay -//go:generate protoc -I.:../../Godeps/_workspace/src/github.com/gogo/protobuf --gogo_out=import_path=github.com/docker/docker/libnetwork/drivers/overlay,Mgogoproto/gogo.proto=github.com/gogo/protobuf/gogoproto:. overlay.proto +//go:generate protoc -I=. -I=../../../../vendor/ --gogo_out=import_path=github.com/docker/docker/libnetwork/drivers/overlay:. overlay.proto import ( "encoding/json" diff --git a/libnetwork/networkdb/networkdb.go b/libnetwork/networkdb/networkdb.go index 9127eed8db..5e99c40536 100644 --- a/libnetwork/networkdb/networkdb.go +++ b/libnetwork/networkdb/networkdb.go @@ -1,6 +1,6 @@ package networkdb -//go:generate protoc -I.:../vendor/github.com/gogo/protobuf --gogo_out=import_path=github.com/docker/docker/libnetwork/networkdb,Mgogoproto/gogo.proto=github.com/gogo/protobuf/gogoproto:. networkdb.proto +//go:generate protoc -I=. -I=../../vendor/ --gogo_out=import_path=github.com/docker/docker/libnetwork/networkdb:. networkdb.proto import ( "context" diff --git a/libnetwork/networkdb/networkdb.proto b/libnetwork/networkdb/networkdb.proto index 4e1272eb89..981ed8399d 100644 --- a/libnetwork/networkdb/networkdb.proto +++ b/libnetwork/networkdb/networkdb.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -import "gogoproto/gogo.proto"; +import "github.com/gogo/protobuf/gogoproto/gogo.proto"; package networkdb;