From de69555afaf05efcdeea7b7c20c6f7b12f3e1bac Mon Sep 17 00:00:00 2001 From: Mark Asselstine Date: Fri, 20 Jan 2017 11:58:44 -0500 Subject: [PATCH] context: use golang.org/x/net pkg until we move to go 1.7 In go 1.6 the context.go is not yet integrated and as such we will get build errors like: walwrap.go:4:2: cannot find package "context" in any of: ... Signed-off-by: Mark Asselstine --- client/README.md | 2 +- client/client.go | 2 +- daemon/info_unix.go | 2 +- integration-cli/docker_api_attach_test.go | 2 +- integration-cli/docker_cli_save_load_unix_test.go | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) --- a/client/README.md +++ b/client/README.md @@ -8,7 +8,7 @@ For example, to list running containers package main import ( - "context" + "golang.org/x/net/context" "fmt" "github.com/docker/docker/api/types" --- a/client/client.go +++ b/client/client.go @@ -19,7 +19,7 @@ For example, to list running containers package main import ( - "context" + "golang.org/x/net/context" "fmt" "github.com/docker/docker/api/types" --- a/daemon/info_unix.go +++ b/daemon/info_unix.go @@ -3,7 +3,7 @@ package daemon import ( - "context" + "golang.org/x/net/context" "os/exec" "strings" --- a/integration-cli/docker_api_attach_test.go +++ b/integration-cli/docker_api_attach_test.go @@ -3,7 +3,7 @@ package main import ( "bufio" "bytes" - "context" + "golang.org/x/net/context" "io" "net" "net/http" --- a/integration-cli/docker_cli_save_load_unix_test.go +++ b/integration-cli/docker_cli_save_load_unix_test.go @@ -3,7 +3,7 @@ package main import ( - "context" + "golang.org/x/net/context" "fmt" "io/ioutil" "os"