build: fix breaking 1.8.3 build

Fixes #638. Latest kata-runtime can't build with golang 1.8.3, fix it for backward compatibility. Signed-off-by: Wei Zhang <[email protected]>
kata-containers · Aug 31, 2018 · af0c137 · af0c137
1 parent 7d14aea
commit af0c137
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/virtcontainers/agent.go b/virtcontainers/agent.go
@@ -6,13 +6,13 @@
 package virtcontainers
 
 import (
-	"context"
 	"fmt"
 	"syscall"
 
 	"github.com/kata-containers/agent/protocols/grpc"
 	"github.com/mitchellh/mapstructure"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
+	"golang.org/x/net/context"
 )
 
 // AgentType describes the type of guest agent a Sandbox should run.

diff --git a/virtcontainers/hyperstart_agent.go b/virtcontainers/hyperstart_agent.go
@@ -6,7 +6,6 @@
 package virtcontainers
 
 import (
-	"context"
 	"fmt"
 	"net"
 	"net/url"
@@ -25,6 +24,7 @@ import (
 	ns "github.com/kata-containers/runtime/virtcontainers/pkg/nsenter"
 	"github.com/kata-containers/runtime/virtcontainers/utils"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
+	"golang.org/x/net/context"
 )
 
 var defaultSockPathTemplates = []string{"%s/%s/hyper.sock", "%s/%s/tty.sock"}

diff --git a/virtcontainers/noop_agent.go b/virtcontainers/noop_agent.go
@@ -6,11 +6,11 @@
 package virtcontainers
 
 import (
-	"context"
 	"syscall"
 
 	"github.com/kata-containers/agent/protocols/grpc"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
+	"golang.org/x/net/context"
 )
 
 // noopAgent a.k.a. NO-OP Agent is an empty Agent implementation, for testing and