Merge pull request kata-containers#503 from teawater/fix_shimv2

Revert vendor: Update libcontainer vendoring

Gopkg.toml

@@ -12,7 +12,7 @@
 
 [[constraint]]
   name = "github.com/opencontainers/runc"
-  revision = "f56b4cbeadc407e715d9b2ba49e62185bd81cef4"
+  revision = "cc4307ab6643668ce5abc6b524e1764a54c32550"
 
 [[constraint]]
   name = "github.com/opencontainers/runtime-spec"

grpc.go

@@ -292,7 +292,7 @@ func setConsoleCarriageReturn(fd int) error {
 	return unix.IoctlSetTermios(fd, unix.TCSETS, termios)
 }
 
-func buildProcess(agentProcess *pb.Process, procID string, init bool) (*process, error) {
+func buildProcess(agentProcess *pb.Process, procID string) (*process, error) {
 	user := agentProcess.User.Username
 	if user == "" {
 		// We can specify the user and the group separated by ":"
@@ -312,7 +312,6 @@ func buildProcess(agentProcess *pb.Process, procID string, init bool) (*process,
 			Env:              agentProcess.Env,
 			User:             user,
 			AdditionalGroups: additionalGids,
-			Init:             init,
 		},
 	}
 
@@ -584,7 +583,7 @@ func (a *agentGRPC) finishCreateContainer(ctr *container, req *pb.CreateContaine
 	}
 	ctr.config = *config
 
-	ctr.initProcess, err = buildProcess(req.OCI.Process, req.ExecId, true)
+	ctr.initProcess, err = buildProcess(req.OCI.Process, req.ExecId)
 	if err != nil {
 		return emptyResp, err
 	}
@@ -875,7 +874,7 @@ func (a *agentGRPC) ExecProcess(ctx context.Context, req *pb.ExecProcessRequest)
 		return nil, grpcStatus.Errorf(codes.FailedPrecondition, "Cannot exec in stopped container %s", req.ContainerId)
 	}
 
-	proc, err := buildProcess(req.Process, req.ExecId, false)
+	proc, err := buildProcess(req.Process, req.ExecId)
 	if err != nil {
 		return emptyResp, err
 	}

mockcontainer.go

@@ -12,7 +12,6 @@ import (
 
 	"github.com/opencontainers/runc/libcontainer"
 	"github.com/opencontainers/runc/libcontainer/configs"
-	"github.com/opencontainers/runtime-spec/specs-go"
 )
 
 type mockContainer struct {
@@ -34,10 +33,6 @@ func (m *mockContainer) State() (*libcontainer.State, error) {
 	return nil, nil
 }
 
-func (m *mockContainer) OCIState() (*specs.State, error) {
-	return nil, nil
-}
-
 func (m *mockContainer) Config() configs.Config {
 	return configs.Config{
 		Capabilities: &configs.Capabilities{},