瀏覽代碼

fix protos and "go generate" commands

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
CrazyMax 2 年之前
父節點
當前提交
1eaea43581

+ 1 - 1
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"
 package runtime // import "github.com/docker/docker/api/types/swarm/runtime"

+ 0 - 2
api/types/swarm/runtime/plugin.proto

@@ -1,7 +1,5 @@
 syntax = "proto3";
 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
 // PluginSpec defines the base payload which clients can specify for creating
 // a service with the plugin runtime.
 // a service with the plugin runtime.
 message PluginSpec {
 message PluginSpec {

+ 1 - 1
libnetwork/agent.go

@@ -1,6 +1,6 @@
 package libnetwork
 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 (
 import (
 	"encoding/json"
 	"encoding/json"

+ 1 - 1
libnetwork/agent.proto

@@ -1,6 +1,6 @@
 syntax = "proto3";
 syntax = "proto3";
 
 
-import "gogoproto/gogo.proto";
+import "github.com/gogo/protobuf/gogoproto/gogo.proto";
 
 
 package libnetwork;
 package libnetwork;
 
 

+ 1 - 1
libnetwork/drivers/overlay/overlay.go

@@ -2,7 +2,7 @@
 
 
 package overlay
 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 (
 import (
 	"fmt"
 	"fmt"

+ 1 - 1
libnetwork/drivers/overlay/overlay.proto

@@ -1,6 +1,6 @@
 syntax = "proto3";
 syntax = "proto3";
 
 
-import "gogoproto/gogo.proto";
+import "github.com/gogo/protobuf/gogoproto/gogo.proto";
 
 
 package overlay;
 package overlay;
 
 

+ 1 - 1
libnetwork/drivers/windows/overlay/overlay.proto

@@ -1,6 +1,6 @@
 syntax = "proto3";
 syntax = "proto3";
 
 
-import "gogoproto/gogo.proto";
+import "github.com/gogo/protobuf/gogoproto/gogo.proto";
 
 
 package overlay;
 package overlay;
 
 

+ 1 - 1
libnetwork/drivers/windows/overlay/overlay_windows.go

@@ -1,6 +1,6 @@
 package overlay
 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 (
 import (
 	"encoding/json"
 	"encoding/json"

+ 1 - 1
libnetwork/networkdb/networkdb.go

@@ -1,6 +1,6 @@
 package networkdb
 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 (
 import (
 	"context"
 	"context"

+ 1 - 1
libnetwork/networkdb/networkdb.proto

@@ -1,6 +1,6 @@
 syntax = "proto3";
 syntax = "proto3";
 
 
-import "gogoproto/gogo.proto";
+import "github.com/gogo/protobuf/gogoproto/gogo.proto";
 
 
 package networkdb;
 package networkdb;