diff options
Diffstat (limited to 'import-layers/meta-virtualization/recipes-containers/docker/files/context-use-golang.org-x-net-pkg-until-we-move-to-go.patch')
| -rw-r--r-- | import-layers/meta-virtualization/recipes-containers/docker/files/context-use-golang.org-x-net-pkg-until-we-move-to-go.patch | 77 |
1 files changed, 18 insertions, 59 deletions
diff --git a/import-layers/meta-virtualization/recipes-containers/docker/files/context-use-golang.org-x-net-pkg-until-we-move-to-go.patch b/import-layers/meta-virtualization/recipes-containers/docker/files/context-use-golang.org-x-net-pkg-until-we-move-to-go.patch index 240b74418..7ed606ff5 100644 --- a/import-layers/meta-virtualization/recipes-containers/docker/files/context-use-golang.org-x-net-pkg-until-we-move-to-go.patch +++ b/import-layers/meta-virtualization/recipes-containers/docker/files/context-use-golang.org-x-net-pkg-until-we-move-to-go.patch @@ -11,20 +11,16 @@ 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 +- - vendor/github.com/docker/swarmkit/manager/logbroker/subscription.go | 2 +- - vendor/github.com/docker/swarmkit/manager/state/raft/storage/walwrap.go | 2 +- - 7 files changed, 7 insertions(+), 7 deletions(-) + 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(-) -diff --git a/client/README.md b/client/README.md -index 059dfb3..9de54aa 100644 ---- a/client/README.md -+++ b/client/README.md -@@ -8,7 +8,7 @@ For example, to list running containers (the equivalent of `docker ps`): +--- 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 ( @@ -33,11 +29,9 @@ index 059dfb3..9de54aa 100644 "fmt" "github.com/docker/docker/api/types" -diff --git a/client/client.go b/client/client.go -index a9bdab6..95933af 100644 ---- a/client/client.go -+++ b/client/client.go -@@ -19,7 +19,7 @@ For example, to list running containers (the equivalent of "docker ps"): +--- 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 ( @@ -46,10 +40,8 @@ index a9bdab6..95933af 100644 "fmt" "github.com/docker/docker/api/types" -diff --git a/daemon/info_unix.go b/daemon/info_unix.go -index 9c41c0e..57f8a7b 100644 ---- a/daemon/info_unix.go -+++ b/daemon/info_unix.go +--- a/src/import/daemon/info_unix.go ++++ b/src/import/daemon/info_unix.go @@ -3,7 +3,7 @@ package daemon @@ -59,10 +51,8 @@ index 9c41c0e..57f8a7b 100644 "os/exec" "strings" -diff --git a/integration-cli/docker_api_attach_test.go b/integration-cli/docker_api_attach_test.go -index d43bf3a..e5802a7 100644 ---- a/integration-cli/docker_api_attach_test.go -+++ b/integration-cli/docker_api_attach_test.go +--- 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" @@ -72,10 +62,8 @@ index d43bf3a..e5802a7 100644 "io" "net" "net/http" -diff --git a/integration-cli/docker_cli_save_load_unix_test.go b/integration-cli/docker_cli_save_load_unix_test.go -index 22445e5..d0afc8c 100644 ---- a/integration-cli/docker_cli_save_load_unix_test.go -+++ b/integration-cli/docker_cli_save_load_unix_test.go +--- 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 @@ -85,32 +73,3 @@ index 22445e5..d0afc8c 100644 "fmt" "io/ioutil" "os" -diff --git a/vendor/github.com/docker/swarmkit/manager/logbroker/subscription.go b/vendor/github.com/docker/swarmkit/manager/logbroker/subscription.go -index 6b3295a..cbfcf7e 100644 ---- a/vendor/github.com/docker/swarmkit/manager/logbroker/subscription.go -+++ b/vendor/github.com/docker/swarmkit/manager/logbroker/subscription.go -@@ -1,7 +1,7 @@ - package logbroker - - import ( -- "context" -+ "golang.org/x/net/context" - "fmt" - "strings" - "sync" -diff --git a/vendor/github.com/docker/swarmkit/manager/state/raft/storage/walwrap.go b/vendor/github.com/docker/swarmkit/manager/state/raft/storage/walwrap.go -index 5a6c71a..efe5921 100644 ---- a/vendor/github.com/docker/swarmkit/manager/state/raft/storage/walwrap.go -+++ b/vendor/github.com/docker/swarmkit/manager/state/raft/storage/walwrap.go -@@ -1,7 +1,7 @@ - package storage - - import ( -- "context" -+ "golang.org/x/net/context" - "io" - "io/ioutil" - "os" --- -2.7.4 - |
