1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
|
From de69555afaf05efcdeea7b7c20c6f7b12f3e1bac Mon Sep 17 00:00:00 2001
From: Mark Asselstine <mark.asselstine@windriver.com>
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 <mark.asselstine@windriver.com>
---
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/src/import/client/README.md
+++ b/src/import/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/src/import/client/client.go
+++ b/src/import/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/src/import/daemon/info_unix.go
+++ b/src/import/daemon/info_unix.go
@@ -3,7 +3,7 @@
package daemon
import (
- "context"
+ "golang.org/x/net/context"
"os/exec"
"strings"
--- a/src/import/integration-cli/docker_api_attach_test.go
+++ b/src/import/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/src/import/integration-cli/docker_cli_save_load_unix_test.go
+++ b/src/import/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"
|
