github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-06 20:09:44 +00:00
Code Issues Projects Releases Wiki Activity

build: fix breaking 1.8.3 build

Browse Source 
Fixes #638.

Latest kata-runtime can't build with golang 1.8.3, fix it for backward compatibility.

Signed-off-by: Wei Zhang <zhangwei555@huawei.com>
This commit is contained in:
Wei Zhang 2018-08-29 19:32:57 +08:00
parent 7d14aea067
commit af0c137ec3
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
virtcontainers/agent.go
View File

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

2
virtcontainers/hyperstart_agent.go
View File

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

2
virtcontainers/noop_agent.go
View File

@ -6,11 +6,11 @@
package virtcontainers package virtcontainers
import ( import (
"context"
"syscall" "syscall"
"github.com/kata-containers/agent/protocols/grpc" "github.com/kata-containers/agent/protocols/grpc"
specs "github.com/opencontainers/runtime-spec/specs-go" 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 // noopAgent a.k.a. NO-OP Agent is an empty Agent implementation, for testing and