Merge pull request #2387 from ehazlett/runtime-shim

dmcgowan · web-flow · commit 00d491063326 · 2018-06-06T13:38:52.000-07:00
Move runtime/linux/shim -&gt; runtime/shim
diff --git a/Protobuild.toml b/Protobuild.toml
@@ -37,7 +37,7 @@ plugins = ["fieldpath"] # disable grpc for this package
 
 [[overrides]]
 # enable ttrpc and disable fieldpath and grpc for the shim
-prefixes = ["github.com/containerd/containerd/runtime/linux/shim/v1"]
+prefixes = ["github.com/containerd/containerd/runtime/shim/v1"]
 plugins = ["ttrpc"]
 
 # Aggregrate the API descriptors to lock down API changes.
diff --git a/cmd/containerd-shim/main_unix.go b/cmd/containerd-shim/main_unix.go
@@ -37,8 +37,8 @@ import (
 	"github.com/containerd/containerd/events"
 	"github.com/containerd/containerd/namespaces"
 	"github.com/containerd/containerd/runtime/linux/proc"
-	"github.com/containerd/containerd/runtime/linux/shim"
-	shimapi "github.com/containerd/containerd/runtime/linux/shim/v1"
+	"github.com/containerd/containerd/runtime/shim"
+	shimapi "github.com/containerd/containerd/runtime/shim/v1"
 	"github.com/containerd/typeurl"
 	ptypes "github.com/gogo/protobuf/types"
 	"github.com/pkg/errors"
diff --git a/cmd/containerd-shim/shim_darwin.go b/cmd/containerd-shim/shim_darwin.go
@@ -22,7 +22,7 @@ import (
 	"os"
 	"os/signal"
 
-	"github.com/containerd/containerd/runtime/linux/shim"
+	"github.com/containerd/containerd/runtime/shim"
 	runc "github.com/containerd/go-runc"
 	"github.com/stevvooe/ttrpc"
 )
diff --git a/cmd/containerd-shim/shim_linux.go b/cmd/containerd-shim/shim_linux.go
@@ -20,7 +20,7 @@ import (
 	"os"
 	"os/signal"
 
-	"github.com/containerd/containerd/runtime/linux/shim"
+	"github.com/containerd/containerd/runtime/shim"
 	runc "github.com/containerd/go-runc"
 	"github.com/opencontainers/runc/libcontainer/system"
 	"github.com/stevvooe/ttrpc"
diff --git a/cmd/containerd-shim/shim_unix.go b/cmd/containerd-shim/shim_unix.go
@@ -22,7 +22,7 @@ import (
 	"os"
 	"os/signal"
 
-	"github.com/containerd/containerd/runtime/linux/shim"
+	"github.com/containerd/containerd/runtime/shim"
 	runc "github.com/containerd/go-runc"
 	"github.com/stevvooe/ttrpc"
 )
diff --git a/cmd/ctr/commands/shim/shim.go b/cmd/ctr/commands/shim/shim.go
@@ -26,7 +26,7 @@ import (
 
 	"github.com/containerd/console"
 	"github.com/containerd/containerd/cmd/ctr/commands"
-	shim "github.com/containerd/containerd/runtime/linux/shim/v1"
+	shim "github.com/containerd/containerd/runtime/shim/v1"
 	"github.com/containerd/typeurl"
 	ptypes "github.com/gogo/protobuf/types"
 	"github.com/opencontainers/runtime-spec/specs-go"
diff --git a/runtime/linux/bundle.go b/runtime/linux/bundle.go
@@ -26,8 +26,8 @@ import (
 
 	"github.com/containerd/containerd/events/exchange"
 	"github.com/containerd/containerd/runtime/linux/runctypes"
-	"github.com/containerd/containerd/runtime/linux/shim"
-	"github.com/containerd/containerd/runtime/linux/shim/client"
+	"github.com/containerd/containerd/runtime/shim"
+	"github.com/containerd/containerd/runtime/shim/client"
 	"github.com/pkg/errors"
 )
 
diff --git a/runtime/linux/process.go b/runtime/linux/process.go
@@ -25,7 +25,7 @@ import (
 	"github.com/containerd/containerd/api/types/task"
 	"github.com/containerd/containerd/errdefs"
 	"github.com/containerd/containerd/runtime"
-	shim "github.com/containerd/containerd/runtime/linux/shim/v1"
+	shim "github.com/containerd/containerd/runtime/shim/v1"
 	"github.com/pkg/errors"
 	"github.com/stevvooe/ttrpc"
 )
diff --git a/runtime/linux/runtime.go b/runtime/linux/runtime.go
@@ -42,7 +42,7 @@ import (
 	"github.com/containerd/containerd/runtime"
 	"github.com/containerd/containerd/runtime/linux/proc"
 	"github.com/containerd/containerd/runtime/linux/runctypes"
-	shim "github.com/containerd/containerd/runtime/linux/shim/v1"
+	shim "github.com/containerd/containerd/runtime/shim/v1"
 	runc "github.com/containerd/go-runc"
 	"github.com/containerd/typeurl"
 	ptypes "github.com/gogo/protobuf/types"
diff --git a/runtime/linux/task.go b/runtime/linux/task.go
@@ -29,8 +29,8 @@ import (
 	"github.com/containerd/containerd/events/exchange"
 	"github.com/containerd/containerd/identifiers"
 	"github.com/containerd/containerd/runtime"
-	"github.com/containerd/containerd/runtime/linux/shim/client"
-	shim "github.com/containerd/containerd/runtime/linux/shim/v1"
+	"github.com/containerd/containerd/runtime/shim/client"
+	shim "github.com/containerd/containerd/runtime/shim/v1"
 	runc "github.com/containerd/go-runc"
 	"github.com/gogo/protobuf/types"
 	"github.com/pkg/errors"
diff --git a/runtime/shim/client/client.go b/runtime/shim/client/client.go
@@ -37,8 +37,8 @@ import (
 
 	"github.com/containerd/containerd/events"
 	"github.com/containerd/containerd/log"
-	"github.com/containerd/containerd/runtime/linux/shim"
-	shimapi "github.com/containerd/containerd/runtime/linux/shim/v1"
+	"github.com/containerd/containerd/runtime/shim"
+	shimapi "github.com/containerd/containerd/runtime/shim/v1"
 	"github.com/containerd/containerd/sys"
 	ptypes "github.com/gogo/protobuf/types"
 )
diff --git a/runtime/shim/client/client_linux.go b/runtime/shim/client/client_linux.go
diff --git a/runtime/shim/client/client_unix.go b/runtime/shim/client/client_unix.go
diff --git a/runtime/shim/local.go b/runtime/shim/local.go
@@ -23,7 +23,7 @@ import (
 	"path/filepath"
 
 	"github.com/containerd/containerd/mount"
-	shimapi "github.com/containerd/containerd/runtime/linux/shim/v1"
+	shimapi "github.com/containerd/containerd/runtime/shim/v1"
 	ptypes "github.com/gogo/protobuf/types"
 )
 
diff --git a/runtime/shim/reaper.go b/runtime/shim/reaper.go
diff --git a/runtime/shim/service.go b/runtime/shim/service.go
@@ -34,7 +34,7 @@ import (
 	"github.com/containerd/containerd/runtime"
 	"github.com/containerd/containerd/runtime/linux/proc"
 	"github.com/containerd/containerd/runtime/linux/runctypes"
-	shimapi "github.com/containerd/containerd/runtime/linux/shim/v1"
+	shimapi "github.com/containerd/containerd/runtime/shim/v1"
 	runc "github.com/containerd/go-runc"
 	"github.com/containerd/typeurl"
 	ptypes "github.com/gogo/protobuf/types"
diff --git a/runtime/shim/service_linux.go b/runtime/shim/service_linux.go
diff --git a/runtime/shim/service_unix.go b/runtime/shim/service_unix.go
diff --git a/runtime/shim/v1/doc.go b/runtime/shim/v1/doc.go
diff --git a/runtime/shim/v1/shim.pb.go b/runtime/shim/v1/shim.pb.go
diff --git a/runtime/shim/v1/shim.proto b/runtime/shim/v1/shim.proto
@@ -9,7 +9,7 @@ import "google/protobuf/timestamp.proto";
 import "github.com/containerd/containerd/api/types/mount.proto";
 import "github.com/containerd/containerd/api/types/task/task.proto";
 
-option go_package = "github.com/containerd/containerd/runtime/linux/shim/v1;shim";
+option go_package = "github.com/containerd/containerd/runtime/shim/v1;shim";
 
 // Shim service is launched for each container and is responsible for owning the IO
 // for the container and its additional processes.  The shim is also the parent of

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ import (`
`22`	`22`	`"os"`
`23`	`23`	`"os/signal"`
`24`	`24`
`25`		`- "github.com/containerd/containerd/runtime/linux/shim"`
	`25`	`+ "github.com/containerd/containerd/runtime/shim"`
`26`	`26`	`runc "github.com/containerd/go-runc"`
`27`	`27`	`"github.com/stevvooe/ttrpc"`
`28`	`28`	`)`
Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,8 @@ import (`
`26`	`26`
`27`	`27`	`"github.com/containerd/containerd/events/exchange"`
`28`	`28`	`"github.com/containerd/containerd/runtime/linux/runctypes"`
`29`		`- "github.com/containerd/containerd/runtime/linux/shim"`
`30`		`- "github.com/containerd/containerd/runtime/linux/shim/client"`
	`29`	`+ "github.com/containerd/containerd/runtime/shim"`
	`30`	`+ "github.com/containerd/containerd/runtime/shim/client"`
`31`	`31`	`"github.com/pkg/errors"`
`32`	`32`	`)`
`33`	`33`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ import (`
`25`	`25`	`"github.com/containerd/containerd/api/types/task"`
`26`	`26`	`"github.com/containerd/containerd/errdefs"`
`27`	`27`	`"github.com/containerd/containerd/runtime"`
`28`		`- shim "github.com/containerd/containerd/runtime/linux/shim/v1"`
	`28`	`+ shim "github.com/containerd/containerd/runtime/shim/v1"`
`29`	`29`	`"github.com/pkg/errors"`
`30`	`30`	`"github.com/stevvooe/ttrpc"`
`31`	`31`	`)`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ import (`
`23`	`23`	`"path/filepath"`
`24`	`24`
`25`	`25`	`"github.com/containerd/containerd/mount"`
`26`		`- shimapi "github.com/containerd/containerd/runtime/linux/shim/v1"`
	`26`	`+ shimapi "github.com/containerd/containerd/runtime/shim/v1"`
`27`	`27`	`ptypes "github.com/gogo/protobuf/types"`
`28`	`28`	`)`
`29`	`29`