From a5074cecf18faea1a325c8ac9220d2df41250af5 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Mon, 2 Apr 2018 00:30:50 -0400 Subject: 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 --- ...-golang.org-x-net-pkg-until-we-move-to-go.patch | 75 ---------------------- 1 file changed, 75 deletions(-) delete mode 100644 recipes-containers/docker/files/context-use-golang.org-x-net-pkg-until-we-move-to-go.patch (limited to 'recipes-containers/docker/files/context-use-golang.org-x-net-pkg-until-we-move-to-go.patch') 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 @@ -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/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" -- cgit v1.2.3-54-g00ecf