summaryrefslogtreecommitdiffstats
path: root/recipes-containers/docker/files/context-use-golang.org-x-net-pkg-until-we-move-to-go.patch
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2018-04-02 00:30:50 -0400
committerBruce Ashfield <bruce.ashfield@windriver.com>2018-04-02 00:34:18 -0400
commita5074cecf18faea1a325c8ac9220d2df41250af5 (patch)
treec6be5b7ec3610572d7e9675787dc8ae88c85a35b /recipes-containers/docker/files/context-use-golang.org-x-net-pkg-until-we-move-to-go.patch
parente3d960f4fcd91a84067fbbd6293ce271e74a7740 (diff)
downloadmeta-virtualization-a5074cecf18faea1a325c8ac9220d2df41250af5.tar.gz
docker: uprev to 18.03.0
Uprev the docker daemon, proxy and cli to 18.03.0. The SRCREVs for these updates come from the versions logged in the docker-ce 18.03.0 release. The docker-ce recipe has a pure docker-ce single repository build, but here, we continue to assemble the individual parts for maximum flexibility. Along with the uprev, we add new dependencies required to build the new version; libtool and pkcconfig (although unused by the recipe itself). Finally we switch to a Makefile based build of the cli to allow the commit and docker version to be properly captured in the docker executable. Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'recipes-containers/docker/files/context-use-golang.org-x-net-pkg-until-we-move-to-go.patch')
-rw-r--r--recipes-containers/docker/files/context-use-golang.org-x-net-pkg-until-we-move-to-go.patch75
1 files changed, 0 insertions, 75 deletions
diff --git a/recipes-containers/docker/files/context-use-golang.org-x-net-pkg-until-we-move-to-go.patch b/recipes-containers/docker/files/context-use-golang.org-x-net-pkg-until-we-move-to-go.patch
deleted file mode 100644
index 7ed606ff..00000000
--- a/recipes-containers/docker/files/context-use-golang.org-x-net-pkg-until-we-move-to-go.patch
+++ /dev/null
@@ -1,75 +0,0 @@
1From de69555afaf05efcdeea7b7c20c6f7b12f3e1bac Mon Sep 17 00:00:00 2001
2From: Mark Asselstine <mark.asselstine@windriver.com>
3Date: Fri, 20 Jan 2017 11:58:44 -0500
4Subject: [PATCH] context: use golang.org/x/net pkg until we move to go 1.7
5
6In go 1.6 the context.go is not yet integrated and as such we will get
7build errors like:
8
9walwrap.go:4:2: cannot find package "context" in any of:
10...
11
12Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
13---
14 client/README.md | 2 +-
15 client/client.go | 2 +-
16 daemon/info_unix.go | 2 +-
17 integration-cli/docker_api_attach_test.go | 2 +-
18 integration-cli/docker_cli_save_load_unix_test.go | 2 +-
19 5 files changed, 5 insertions(+), 5 deletions(-)
20
21--- a/src/import/client/README.md
22+++ b/src/import/client/README.md
23@@ -8,7 +8,7 @@ For example, to list running containers
24 package main
25
26 import (
27- "context"
28+ "golang.org/x/net/context"
29 "fmt"
30
31 "github.com/docker/docker/api/types"
32--- a/src/import/client/client.go
33+++ b/src/import/client/client.go
34@@ -19,7 +19,7 @@ For example, to list running containers
35 package main
36
37 import (
38- "context"
39+ "golang.org/x/net/context"
40 "fmt"
41
42 "github.com/docker/docker/api/types"
43--- a/src/import/daemon/info_unix.go
44+++ b/src/import/daemon/info_unix.go
45@@ -3,7 +3,7 @@
46 package daemon
47
48 import (
49- "context"
50+ "golang.org/x/net/context"
51 "os/exec"
52 "strings"
53
54--- a/src/import/integration-cli/docker_api_attach_test.go
55+++ b/src/import/integration-cli/docker_api_attach_test.go
56@@ -3,7 +3,7 @@ package main
57 import (
58 "bufio"
59 "bytes"
60- "context"
61+ "golang.org/x/net/context"
62 "io"
63 "net"
64 "net/http"
65--- a/src/import/integration-cli/docker_cli_save_load_unix_test.go
66+++ b/src/import/integration-cli/docker_cli_save_load_unix_test.go
67@@ -3,7 +3,7 @@
68 package main
69
70 import (
71- "context"
72+ "golang.org/x/net/context"
73 "fmt"
74 "io/ioutil"
75 "os"