1. docker
  2. Commit 7d62e40f7e4f3c17d229a7687d6fcca5448de813
Browse code

Switch from x/net/context -> context

Since Go 1.7, context is a standard package. Since Go 1.9, everything
that is provided by "x/net/context" is a couple of type aliases to
types in "context".

Many vendored packages still use x/net/context, so vendor entry remains
for now.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>

Kir Kolyshkin authored on 2018/04/20 07:30:59
Showing 346 changed files
api/server/backend/build/backend.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package build // import "github.com/docker/docker/api/server/backend/build"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"fmt"
5 6
6 7 
 	"github.com/docker/distribution/reference"
... ... 
@@ -11,7 +12,6 @@ import (
11 11 
 	"github.com/docker/docker/image"
12 12 
 	"github.com/docker/docker/pkg/stringid"
13 13 
 	"github.com/pkg/errors"
14 
-	"golang.org/x/net/context"
15 14 
 )
16 15
17 16 
 // ImageComponent provides an interface for working with images
api/server/httputils/httputils.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package httputils // import "github.com/docker/docker/api/server/httputils"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"io"
5 6 
 	"mime"
6 7 
 	"net/http"
... ... 
@@ -9,7 +10,6 @@ import (
9 9 
 	"github.com/docker/docker/errdefs"
10 10 
 	"github.com/pkg/errors"
11 11 
 	"github.com/sirupsen/logrus"
12 
-	"golang.org/x/net/context"
13 12 
 )
14 13
15 14 
 type contextKey string
api/server/httputils/write_log_stream.go
History View file @ 7d62e40
... ... 
@@ -1,13 +1,12 @@
1 1 
 package httputils // import "github.com/docker/docker/api/server/httputils"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"fmt"
5 6 
 	"io"
6 7 
 	"net/url"
7 8 
 	"sort"
8 9
9 
-	"golang.org/x/net/context"
10 
-
11 10 
 	"github.com/docker/docker/api/types"
12 11 
 	"github.com/docker/docker/api/types/backend"
13 12 
 	"github.com/docker/docker/pkg/ioutils"
api/server/middleware/cors.go
History View file @ 7d62e40
... ... 
@@ -1,10 +1,10 @@
1 1 
 package middleware // import "github.com/docker/docker/api/server/middleware"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"net/http"
5 6
6 7 
 	"github.com/sirupsen/logrus"
7 
-	"golang.org/x/net/context"
8 8 
 )
9 9
10 10 
 // CORSMiddleware injects CORS headers to each request
api/server/middleware/debug.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package middleware // import "github.com/docker/docker/api/server/middleware"
2 2
3 3 
 import (
4 4 
 	"bufio"
5 
+	"context"
5 6 
 	"encoding/json"
6 7 
 	"io"
7 8 
 	"net/http"
... ... 
@@ -10,7 +11,6 @@ import (
10 10 
 	"github.com/docker/docker/api/server/httputils"
11 11 
 	"github.com/docker/docker/pkg/ioutils"
12 12 
 	"github.com/sirupsen/logrus"
13 
-	"golang.org/x/net/context"
14 13 
 )
15 14
16 15 
 // DebugRequestMiddleware dumps the request to logger
api/server/middleware/experimental.go
History View file @ 7d62e40
... ... 
@@ -1,9 +1,8 @@
1 1 
 package middleware // import "github.com/docker/docker/api/server/middleware"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"net/http"
5 
-
6 
-	"golang.org/x/net/context"
7 6 
 )
8 7
9 8 
 // ExperimentalMiddleware is a the middleware in charge of adding the
api/server/middleware/middleware.go
History View file @ 7d62e40
... ... 
@@ -1,9 +1,8 @@
1 1 
 package middleware // import "github.com/docker/docker/api/server/middleware"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"net/http"
5 
-
6 
-	"golang.org/x/net/context"
7 6 
 )
8 7
9 8 
 // Middleware is an interface to allow the use of ordinary functions as Docker API filters.
api/server/middleware/version.go
History View file @ 7d62e40
... ... 
@@ -1,13 +1,13 @@
1 1 
 package middleware // import "github.com/docker/docker/api/server/middleware"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"fmt"
5 6 
 	"net/http"
6 7 
 	"runtime"
7 8
8 9 
 	"github.com/docker/docker/api/server/httputils"
9 10 
 	"github.com/docker/docker/api/types/versions"
10 
-	"golang.org/x/net/context"
11 11 
 )
12 12
13 13 
 // VersionMiddleware is a middleware that
api/server/middleware/version_test.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package middleware // import "github.com/docker/docker/api/server/middleware"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"net/http"
5 6 
 	"net/http/httptest"
6 7 
 	"runtime"
... ... 
@@ -9,7 +10,6 @@ import (
9 9 
 	"github.com/docker/docker/api/server/httputils"
10 10 
 	"github.com/gotestyourself/gotestyourself/assert"
11 11 
 	is "github.com/gotestyourself/gotestyourself/assert/cmp"
12 
-	"golang.org/x/net/context"
13 12 
 )
14 13
15 14 
 func TestVersionMiddlewareVersion(t *testing.T) {
api/server/router/build/backend.go
History View file @ 7d62e40
... ... 
@@ -1,9 +1,10 @@
1 1 
 package build // import "github.com/docker/docker/api/server/router/build"
2 2
3 3 
 import (
4 
+	"context"
5 
+
4 6 
 	"github.com/docker/docker/api/types"
5 7 
 	"github.com/docker/docker/api/types/backend"
6 
-	"golang.org/x/net/context"
7 8 
 )
8 9
9 10 
 // Backend abstracts an image builder whose only purpose is to build an image referenced by an imageID.
api/server/router/build/build_routes.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package build // import "github.com/docker/docker/api/server/router/build"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"encoding/base64"
6 7 
 	"encoding/json"
7 8 
 	"fmt"
... ... 
@@ -25,7 +26,6 @@ import (
25 25 
 	units "github.com/docker/go-units"
26 26 
 	"github.com/pkg/errors"
27 27 
 	"github.com/sirupsen/logrus"
28 
-	"golang.org/x/net/context"
29 28 
 )
30 29
31 30 
 type invalidIsolationError string
api/server/router/checkpoint/checkpoint_routes.go
History View file @ 7d62e40
... ... 
@@ -1,12 +1,12 @@
1 1 
 package checkpoint // import "github.com/docker/docker/api/server/router/checkpoint"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"encoding/json"
5 6 
 	"net/http"
6 7
7 8 
 	"github.com/docker/docker/api/server/httputils"
8 9 
 	"github.com/docker/docker/api/types"
9 
-	"golang.org/x/net/context"
10 10 
 )
11 11
12 12 
 func (s *checkpointRouter) postContainerCheckpoint(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
api/server/router/container/backend.go
History View file @ 7d62e40
... ... 
@@ -1,10 +1,9 @@
1 1 
 package container // import "github.com/docker/docker/api/server/router/container"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"io"
5 6
6 
-	"golang.org/x/net/context"
7 
-
8 7 
 	"github.com/docker/docker/api/types"
9 8 
 	"github.com/docker/docker/api/types/backend"
10 9 
 	"github.com/docker/docker/api/types/container"
api/server/router/container/container_routes.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package container // import "github.com/docker/docker/api/server/router/container"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"encoding/json"
5 6 
 	"fmt"
6 7 
 	"io"
... ... 
@@ -20,7 +21,6 @@ import (
20 20 
 	"github.com/docker/docker/pkg/signal"
21 21 
 	"github.com/pkg/errors"
22 22 
 	"github.com/sirupsen/logrus"
23 
-	"golang.org/x/net/context"
24 23 
 	"golang.org/x/net/websocket"
25 24 
 )
26 25
api/server/router/container/copy.go
History View file @ 7d62e40
... ... 
@@ -3,6 +3,7 @@ package container // import "github.com/docker/docker/api/server/router/containe
3 3 
 import (
4 4 
 	"compress/flate"
5 5 
 	"compress/gzip"
6 
+	"context"
6 7 
 	"encoding/base64"
7 8 
 	"encoding/json"
8 9 
 	"io"
... ... 
@@ -12,7 +13,6 @@ import (
12 12 
 	"github.com/docker/docker/api/types"
13 13 
 	"github.com/docker/docker/api/types/versions"
14 14 
 	gddohttputil "github.com/golang/gddo/httputil"
15 
-	"golang.org/x/net/context"
16 15 
 )
17 16
18 17 
 type pathError struct{}
api/server/router/container/exec.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package container // import "github.com/docker/docker/api/server/router/container"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"encoding/json"
5 6 
 	"fmt"
6 7 
 	"io"
... ... 
@@ -13,7 +14,6 @@ import (
13 13 
 	"github.com/docker/docker/errdefs"
14 14 
 	"github.com/docker/docker/pkg/stdcopy"
15 15 
 	"github.com/sirupsen/logrus"
16 
-	"golang.org/x/net/context"
17 16 
 )
18 17
19 18 
 func (s *containerRouter) getExecByID(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
api/server/router/container/inspect.go
History View file @ 7d62e40
... ... 
@@ -1,10 +1,10 @@
1 1 
 package container // import "github.com/docker/docker/api/server/router/container"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"net/http"
5 6
6 7 
 	"github.com/docker/docker/api/server/httputils"
7 
-	"golang.org/x/net/context"
8 8 
 )
9 9
10 10 
 // getContainersByName inspects container's configuration and serializes it as json.
api/server/router/debug/debug.go
History View file @ 7d62e40
... ... 
@@ -1,13 +1,13 @@
1 1 
 package debug // import "github.com/docker/docker/api/server/router/debug"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"expvar"
5 6 
 	"net/http"
6 7 
 	"net/http/pprof"
7 8
8 9 
 	"github.com/docker/docker/api/server/httputils"
9 10 
 	"github.com/docker/docker/api/server/router"
10 
-	"golang.org/x/net/context"
11 11 
 )
12 12
13 13 
 // NewRouter creates a new debug router
api/server/router/debug/debug_routes.go
History View file @ 7d62e40
... ... 
@@ -1,10 +1,9 @@
1 1 
 package debug // import "github.com/docker/docker/api/server/router/debug"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"net/http"
5 6 
 	"net/http/pprof"
6 
-
7 
-	"golang.org/x/net/context"
8 7 
 )
9 8
10 9 
 func handlePprof(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
api/server/router/distribution/backend.go
History View file @ 7d62e40
... ... 
@@ -1,10 +1,11 @@
1 1 
 package distribution // import "github.com/docker/docker/api/server/router/distribution"
2 2
3 3 
 import (
4 
+	"context"
5 
+
4 6 
 	"github.com/docker/distribution"
5 7 
 	"github.com/docker/distribution/reference"
6 8 
 	"github.com/docker/docker/api/types"
7 
-	"golang.org/x/net/context"
8 9 
 )
9 10
10 11 
 // Backend is all the methods that need to be implemented
api/server/router/distribution/distribution_routes.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package distribution // import "github.com/docker/docker/api/server/router/distribution"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"encoding/base64"
5 6 
 	"encoding/json"
6 7 
 	"net/http"
... ... 
@@ -15,7 +16,6 @@ import (
15 15 
 	registrytypes "github.com/docker/docker/api/types/registry"
16 16 
 	"github.com/opencontainers/image-spec/specs-go/v1"
17 17 
 	"github.com/pkg/errors"
18 
-	"golang.org/x/net/context"
19 18 
 )
20 19
21 20 
 func (s *distributionRouter) getDistributionInfo(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
api/server/router/experimental.go
History View file @ 7d62e40
... ... 
@@ -1,10 +1,9 @@
1 1 
 package router // import "github.com/docker/docker/api/server/router"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"net/http"
5 6
6 
-	"golang.org/x/net/context"
7 
-
8 7 
 	"github.com/docker/docker/api/server/httputils"
9 8 
 )
10 9
api/server/router/image/backend.go
History View file @ 7d62e40
... ... 
@@ -1,13 +1,13 @@
1 1 
 package image // import "github.com/docker/docker/api/server/router/image"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"io"
5 6
6 7 
 	"github.com/docker/docker/api/types"
7 8 
 	"github.com/docker/docker/api/types/filters"
8 9 
 	"github.com/docker/docker/api/types/image"
9 10 
 	"github.com/docker/docker/api/types/registry"
10 
-	"golang.org/x/net/context"
11 11 
 )
12 12
13 13 
 // Backend is all the methods that need to be implemented
api/server/router/image/image_routes.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package image // import "github.com/docker/docker/api/server/router/image"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"encoding/base64"
5 6 
 	"encoding/json"
6 7 
 	"fmt"
... ... 
@@ -19,7 +20,6 @@ import (
19 19 
 	"github.com/docker/docker/registry"
20 20 
 	specs "github.com/opencontainers/image-spec/specs-go/v1"
21 21 
 	"github.com/pkg/errors"
22 
-	"golang.org/x/net/context"
23 22 
 )
24 23
25 24 
 // Creates an image from Pull or from Import
api/server/router/local.go
History View file @ 7d62e40
... ... 
@@ -1,10 +1,10 @@
1 1 
 package router // import "github.com/docker/docker/api/server/router"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"net/http"
5 6
6 7 
 	"github.com/docker/docker/api/server/httputils"
7 
-	"golang.org/x/net/context"
8 8 
 )
9 9
10 10 
 // RouteWrapper wraps a route with extra functionality.
api/server/router/network/backend.go
History View file @ 7d62e40
... ... 
@@ -1,7 +1,7 @@
1 1 
 package network // import "github.com/docker/docker/api/server/router/network"
2 2
3 3 
 import (
4 
-	"golang.org/x/net/context"
4 
+	"context"
5 5
6 6 
 	"github.com/docker/docker/api/types"
7 7 
 	"github.com/docker/docker/api/types/filters"
api/server/router/network/network_routes.go
History View file @ 7d62e40
... ... 
@@ -1,13 +1,12 @@
1 1 
 package network // import "github.com/docker/docker/api/server/router/network"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"encoding/json"
5 6 
 	"net/http"
6 7 
 	"strconv"
7 8 
 	"strings"
8 9
9 
-	"golang.org/x/net/context"
10 
-
11 10 
 	"github.com/docker/docker/api/server/httputils"
12 11 
 	"github.com/docker/docker/api/types"
13 12 
 	"github.com/docker/docker/api/types/filters"
api/server/router/plugin/backend.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package plugin // import "github.com/docker/docker/api/server/router/plugin"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"io"
5 6 
 	"net/http"
6 7
... ... 
@@ -8,7 +9,6 @@ import (
8 8 
 	enginetypes "github.com/docker/docker/api/types"
9 9 
 	"github.com/docker/docker/api/types/filters"
10 10 
 	"github.com/docker/docker/plugin"
11 
-	"golang.org/x/net/context"
12 11 
 )
13 12
14 13 
 // Backend for Plugin
api/server/router/plugin/plugin_routes.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package plugin // import "github.com/docker/docker/api/server/router/plugin"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"encoding/base64"
5 6 
 	"encoding/json"
6 7 
 	"net/http"
... ... 
@@ -14,7 +15,6 @@ import (
14 14 
 	"github.com/docker/docker/pkg/ioutils"
15 15 
 	"github.com/docker/docker/pkg/streamformatter"
16 16 
 	"github.com/pkg/errors"
17 
-	"golang.org/x/net/context"
18 17 
 )
19 18
20 19 
 func parseHeaders(headers http.Header) (map[string][]string, *types.AuthConfig) {
api/server/router/session/backend.go
History View file @ 7d62e40
... ... 
@@ -1,9 +1,8 @@
1 1 
 package session // import "github.com/docker/docker/api/server/router/session"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"net/http"
5 
-
6 
-	"golang.org/x/net/context"
7 6 
 )
8 7
9 8 
 // Backend abstracts an session receiver from an http request.
api/server/router/session/session_routes.go
History View file @ 7d62e40
... ... 
@@ -1,10 +1,10 @@
1 1 
 package session // import "github.com/docker/docker/api/server/router/session"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"net/http"
5 6
6 7 
 	"github.com/docker/docker/errdefs"
7 
-	"golang.org/x/net/context"
8 8 
 )
9 9
10 10 
 func (sr *sessionRouter) startSession(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
api/server/router/swarm/backend.go
History View file @ 7d62e40
... ... 
@@ -1,10 +1,11 @@
1 1 
 package swarm // import "github.com/docker/docker/api/server/router/swarm"
2 2
3 3 
 import (
4 
+	"context"
5 
+
4 6 
 	basictypes "github.com/docker/docker/api/types"
5 7 
 	"github.com/docker/docker/api/types/backend"
6 8 
 	types "github.com/docker/docker/api/types/swarm"
7 
-	"golang.org/x/net/context"
8 9 
 )
9 10
10 11 
 // Backend abstracts a swarm manager.
api/server/router/swarm/cluster_routes.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package swarm // import "github.com/docker/docker/api/server/router/swarm"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"encoding/json"
5 6 
 	"fmt"
6 7 
 	"net/http"
... ... 
@@ -15,7 +16,6 @@ import (
15 15 
 	"github.com/docker/docker/errdefs"
16 16 
 	"github.com/pkg/errors"
17 17 
 	"github.com/sirupsen/logrus"
18 
-	"golang.org/x/net/context"
19 18 
 )
20 19
21 20 
 func (sr *swarmRouter) initCluster(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
api/server/router/swarm/helpers.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package swarm // import "github.com/docker/docker/api/server/router/swarm"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"fmt"
5 6 
 	"io"
6 7 
 	"net/http"
... ... 
@@ -8,7 +9,6 @@ import (
8 8 
 	"github.com/docker/docker/api/server/httputils"
9 9 
 	basictypes "github.com/docker/docker/api/types"
10 10 
 	"github.com/docker/docker/api/types/backend"
11 
-	"golang.org/x/net/context"
12 11 
 )
13 12
14 13 
 // swarmLogs takes an http response, request, and selector, and writes the logs
api/server/router/system/backend.go
History View file @ 7d62e40
... ... 
@@ -1,13 +1,13 @@
1 1 
 package system // import "github.com/docker/docker/api/server/router/system"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"time"
5 6
6 7 
 	"github.com/docker/docker/api/types"
7 8 
 	"github.com/docker/docker/api/types/events"
8 9 
 	"github.com/docker/docker/api/types/filters"
9 10 
 	"github.com/docker/docker/api/types/swarm"
10 
-	"golang.org/x/net/context"
11 11 
 )
12 12
13 13 
 // Backend is the methods that need to be implemented to provide
api/server/router/system/system_routes.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package system // import "github.com/docker/docker/api/server/router/system"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"encoding/json"
5 6 
 	"fmt"
6 7 
 	"net/http"
... ... 
@@ -16,7 +17,6 @@ import (
16 16 
 	"github.com/docker/docker/pkg/ioutils"
17 17 
 	pkgerrors "github.com/pkg/errors"
18 18 
 	"github.com/sirupsen/logrus"
19 
-	"golang.org/x/net/context"
20 19 
 )
21 20
22 21 
 func optionsHandler(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
api/server/router/volume/backend.go
History View file @ 7d62e40
... ... 
@@ -1,7 +1,7 @@
1 1 
 package volume // import "github.com/docker/docker/api/server/router/volume"
2 2
3 3 
 import (
4 
-	"golang.org/x/net/context"
4 
+	"context"
5 5
6 6 
 	// TODO return types need to be refactored into pkg
7 7 
 	"github.com/docker/docker/api/types"
api/server/router/volume/volume_routes.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package volume // import "github.com/docker/docker/api/server/router/volume"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"encoding/json"
5 6 
 	"errors"
6 7 
 	"io"
... ... 
@@ -10,7 +11,6 @@ import (
10 10 
 	"github.com/docker/docker/api/types/filters"
11 11 
 	volumetypes "github.com/docker/docker/api/types/volume"
12 12 
 	"github.com/docker/docker/errdefs"
13 
-	"golang.org/x/net/context"
14 13 
 )
15 14
16 15 
 func (v *volumeRouter) getVolumesList(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
api/server/server.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package server // import "github.com/docker/docker/api/server"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"crypto/tls"
5 6 
 	"net"
6 7 
 	"net/http"
... ... 
@@ -13,7 +14,6 @@ import (
13 13 
 	"github.com/docker/docker/dockerversion"
14 14 
 	"github.com/gorilla/mux"
15 15 
 	"github.com/sirupsen/logrus"
16 
-	"golang.org/x/net/context"
17 16 
 )
18 17
19 18 
 // versionMatcher defines a variable matcher to be parsed by the router
api/server/server_test.go
History View file @ 7d62e40
... ... 
@@ -6,11 +6,11 @@ import (
6 6 
 	"strings"
7 7 
 	"testing"
8 8
9 
+	"context"
10 
+
9 11 
 	"github.com/docker/docker/api"
10 12 
 	"github.com/docker/docker/api/server/httputils"
11 13 
 	"github.com/docker/docker/api/server/middleware"
12 
-
13 
-	"golang.org/x/net/context"
14 14 
 )
15 15
16 16 
 func TestMiddlewares(t *testing.T) {
builder/builder.go
History View file @ 7d62e40
... ... 
@@ -5,6 +5,7 @@
5 5 
 package builder // import "github.com/docker/docker/builder"
6 6
7 7 
 import (
8 
+	"context"
8 9 
 	"io"
9 10
10 11 
 	"github.com/docker/docker/api/types"
... ... 
@@ -14,7 +15,6 @@ import (
14 14 
 	"github.com/docker/docker/image"
15 15 
 	"github.com/docker/docker/layer"
16 16 
 	"github.com/docker/docker/pkg/containerfs"
17 
-	"golang.org/x/net/context"
18 17 
 )
19 18
20 19 
 const (
builder/dockerfile/builder.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package dockerfile // import "github.com/docker/docker/builder/dockerfile"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"fmt"
6 7 
 	"io"
7 8 
 	"io/ioutil"
... ... 
@@ -25,7 +26,6 @@ import (
25 25 
 	"github.com/moby/buildkit/session"
26 26 
 	"github.com/pkg/errors"
27 27 
 	"github.com/sirupsen/logrus"
28 
-	"golang.org/x/net/context"
29 28 
 	"golang.org/x/sync/syncmap"
30 29 
 )
31 30
builder/dockerfile/clientsession.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package dockerfile // import "github.com/docker/docker/builder/dockerfile"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"time"
5 6
6 7 
 	"github.com/docker/docker/builder/fscache"
... ... 
@@ -8,7 +9,6 @@ import (
8 8 
 	"github.com/moby/buildkit/session"
9 9 
 	"github.com/moby/buildkit/session/filesync"
10 10 
 	"github.com/pkg/errors"
11 
-	"golang.org/x/net/context"
12 11 
 )
13 12
14 13 
 const sessionConnectTimeout = 5 * time.Second
builder/dockerfile/containerbackend.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package dockerfile // import "github.com/docker/docker/builder/dockerfile"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"fmt"
5 6 
 	"io"
6 7
... ... 
@@ -11,7 +12,6 @@ import (
11 11 
 	"github.com/docker/docker/pkg/stringid"
12 12 
 	"github.com/pkg/errors"
13 13 
 	"github.com/sirupsen/logrus"
14 
-	"golang.org/x/net/context"
15 14 
 )
16 15
17 16 
 type containerManager struct {
builder/dockerfile/imagecontext.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package dockerfile // import "github.com/docker/docker/builder/dockerfile"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"runtime"
5 6
6 7 
 	"github.com/docker/docker/api/types/backend"
... ... 
@@ -8,7 +9,6 @@ import (
8 8 
 	dockerimage "github.com/docker/docker/image"
9 9 
 	"github.com/pkg/errors"
10 10 
 	"github.com/sirupsen/logrus"
11 
-	"golang.org/x/net/context"
12 11 
 )
13 12
14 13 
 type getAndMountFunc func(string, bool, string) (builder.Image, builder.ROLayer, error)
builder/dockerfile/mockbackend_test.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package dockerfile // import "github.com/docker/docker/builder/dockerfile"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"encoding/json"
5 6 
 	"io"
6 7 
 	"runtime"
... ... 
@@ -13,7 +14,6 @@ import (
13 13 
 	"github.com/docker/docker/image"
14 14 
 	"github.com/docker/docker/layer"
15 15 
 	"github.com/docker/docker/pkg/containerfs"
16 
-	"golang.org/x/net/context"
17 16 
 )
18 17
19 18 
 // MockBackend implements the builder.Backend interface for unit testing
builder/fscache/fscache.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package fscache // import "github.com/docker/docker/builder/fscache"
2 2
3 3 
 import (
4 4 
 	"archive/tar"
5 
+	"context"
5 6 
 	"crypto/sha256"
6 7 
 	"encoding/json"
7 8 
 	"hash"
... ... 
@@ -22,7 +23,6 @@ import (
22 22 
 	"github.com/pkg/errors"
23 23 
 	"github.com/sirupsen/logrus"
24 24 
 	"github.com/tonistiigi/fsutil"
25 
-	"golang.org/x/net/context"
26 25 
 	"golang.org/x/sync/singleflight"
27 26 
 )
28 27
builder/fscache/fscache_test.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package fscache // import "github.com/docker/docker/builder/fscache"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"io/ioutil"
5 6 
 	"os"
6 7 
 	"path/filepath"
... ... 
@@ -10,7 +11,6 @@ import (
10 10 
 	"github.com/gotestyourself/gotestyourself/assert"
11 11 
 	is "github.com/gotestyourself/gotestyourself/assert/cmp"
12 12 
 	"github.com/moby/buildkit/session/filesync"
13 
-	"golang.org/x/net/context"
14 13 
 )
15 14
16 15 
 func TestFSCache(t *testing.T) {
client/build_prune.go
History View file @ 7d62e40
... ... 
@@ -1,11 +1,11 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"encoding/json"
5 6 
 	"fmt"
6 7
7 8 
 	"github.com/docker/docker/api/types"
8 
-	"golang.org/x/net/context"
9 9 
 )
10 10
11 11 
 // BuildCachePrune requests the daemon to delete unused cache data
client/checkpoint_create.go
History View file @ 7d62e40
... ... 
@@ -1,8 +1,9 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
5 
+
4 6 
 	"github.com/docker/docker/api/types"
5 
-	"golang.org/x/net/context"
6 7 
 )
7 8
8 9 
 // CheckpointCreate creates a checkpoint from the given container with the given name
client/checkpoint_create_test.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"encoding/json"
6 7 
 	"fmt"
7 8 
 	"io/ioutil"
... ... 
@@ -10,7 +11,6 @@ import (
10 10 
 	"testing"
11 11
12 12 
 	"github.com/docker/docker/api/types"
13 
-	"golang.org/x/net/context"
14 13 
 )
15 14
16 15 
 func TestCheckpointCreateError(t *testing.T) {
client/checkpoint_delete.go
History View file @ 7d62e40
... ... 
@@ -1,10 +1,10 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"net/url"
5 6
6 7 
 	"github.com/docker/docker/api/types"
7 
-	"golang.org/x/net/context"
8 8 
 )
9 9
10 10 
 // CheckpointDelete deletes the checkpoint with the given name from the given container
client/checkpoint_delete_test.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"fmt"
6 7 
 	"io/ioutil"
7 8 
 	"net/http"
... ... 
@@ -9,7 +10,6 @@ import (
9 9 
 	"testing"
10 10
11 11 
 	"github.com/docker/docker/api/types"
12 
-	"golang.org/x/net/context"
13 12 
 )
14 13
15 14 
 func TestCheckpointDeleteError(t *testing.T) {
client/checkpoint_list.go
History View file @ 7d62e40
... ... 
@@ -1,11 +1,11 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"encoding/json"
5 6 
 	"net/url"
6 7
7 8 
 	"github.com/docker/docker/api/types"
8 
-	"golang.org/x/net/context"
9 9 
 )
10 10
11 11 
 // CheckpointList returns the checkpoints of the given container in the docker host
client/checkpoint_list_test.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"encoding/json"
6 7 
 	"fmt"
7 8 
 	"io/ioutil"
... ... 
@@ -10,7 +11,6 @@ import (
10 10 
 	"testing"
11 11
12 12 
 	"github.com/docker/docker/api/types"
13 
-	"golang.org/x/net/context"
14 13 
 )
15 14
16 15 
 func TestCheckpointListError(t *testing.T) {
client/client.go
History View file @ 7d62e40
... ... 
@@ -42,6 +42,7 @@ For example, to list running containers (the equivalent of "docker ps"):
42 42 
 package client // import "github.com/docker/docker/client"
43 43
44 44 
 import (
45 
+	"context"
45 46 
 	"fmt"
46 47 
 	"net"
47 48 
 	"net/http"
... ... 
@@ -57,7 +58,6 @@ import (
57 57 
 	"github.com/docker/go-connections/sockets"
58 58 
 	"github.com/docker/go-connections/tlsconfig"
59 59 
 	"github.com/pkg/errors"
60 
-	"golang.org/x/net/context"
61 60 
 )
62 61
63 62 
 // ErrRedirect is the error returned by checkRedirect when the request is non-GET.
client/config_create.go
History View file @ 7d62e40
... ... 
@@ -1,11 +1,11 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"encoding/json"
5 6
6 7 
 	"github.com/docker/docker/api/types"
7 8 
 	"github.com/docker/docker/api/types/swarm"
8 
-	"golang.org/x/net/context"
9 9 
 )
10 10
11 11 
 // ConfigCreate creates a new Config.
client/config_create_test.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"encoding/json"
6 7 
 	"fmt"
7 8 
 	"io/ioutil"
... ... 
@@ -13,7 +14,6 @@ import (
13 13 
 	"github.com/docker/docker/api/types/swarm"
14 14 
 	"github.com/gotestyourself/gotestyourself/assert"
15 15 
 	is "github.com/gotestyourself/gotestyourself/assert/cmp"
16 
-	"golang.org/x/net/context"
17 16 
 )
18 17
19 18 
 func TestConfigCreateUnsupported(t *testing.T) {
client/config_inspect.go
History View file @ 7d62e40
... ... 
@@ -2,11 +2,11 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"encoding/json"
6 7 
 	"io/ioutil"
7 8
8 9 
 	"github.com/docker/docker/api/types/swarm"
9 
-	"golang.org/x/net/context"
10 10 
 )
11 11
12 12 
 // ConfigInspectWithRaw returns the config information with raw data
client/config_inspect_test.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"encoding/json"
6 7 
 	"fmt"
7 8 
 	"io/ioutil"
... ... 
@@ -13,7 +14,6 @@ import (
13 13 
 	"github.com/gotestyourself/gotestyourself/assert"
14 14 
 	is "github.com/gotestyourself/gotestyourself/assert/cmp"
15 15 
 	"github.com/pkg/errors"
16 
-	"golang.org/x/net/context"
17 16 
 )
18 17
19 18 
 func TestConfigInspectNotFound(t *testing.T) {
client/config_list.go
History View file @ 7d62e40
... ... 
@@ -1,13 +1,13 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"encoding/json"
5 6 
 	"net/url"
6 7
7 8 
 	"github.com/docker/docker/api/types"
8 9 
 	"github.com/docker/docker/api/types/filters"
9 10 
 	"github.com/docker/docker/api/types/swarm"
10 
-	"golang.org/x/net/context"
11 11 
 )
12 12
13 13 
 // ConfigList returns the list of configs.
client/config_list_test.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"encoding/json"
6 7 
 	"fmt"
7 8 
 	"io/ioutil"
... ... 
@@ -14,7 +15,6 @@ import (
14 14 
 	"github.com/docker/docker/api/types/swarm"
15 15 
 	"github.com/gotestyourself/gotestyourself/assert"
16 16 
 	is "github.com/gotestyourself/gotestyourself/assert/cmp"
17 
-	"golang.org/x/net/context"
18 17 
 )
19 18
20 19 
 func TestConfigListUnsupported(t *testing.T) {
client/config_remove.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,6 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 
-import "golang.org/x/net/context"
3 
+import "context"
4 4
5 5 
 // ConfigRemove removes a Config.
6 6 
 func (cli *Client) ConfigRemove(ctx context.Context, id string) error {
client/config_remove_test.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"fmt"
6 7 
 	"io/ioutil"
7 8 
 	"net/http"
... ... 
@@ -10,7 +11,6 @@ import (
10 10
11 11 
 	"github.com/gotestyourself/gotestyourself/assert"
12 12 
 	is "github.com/gotestyourself/gotestyourself/assert/cmp"
13 
-	"golang.org/x/net/context"
14 13 
 )
15 14
16 15 
 func TestConfigRemoveUnsupported(t *testing.T) {
client/config_update.go
History View file @ 7d62e40
... ... 
@@ -1,11 +1,11 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"net/url"
5 6 
 	"strconv"
6 7
7 8 
 	"github.com/docker/docker/api/types/swarm"
8 
-	"golang.org/x/net/context"
9 9 
 )
10 10
11 11 
 // ConfigUpdate attempts to update a Config
client/config_update_test.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"fmt"
6 7 
 	"io/ioutil"
7 8 
 	"net/http"
... ... 
@@ -11,7 +12,6 @@ import (
11 11 
 	"github.com/docker/docker/api/types/swarm"
12 12 
 	"github.com/gotestyourself/gotestyourself/assert"
13 13 
 	is "github.com/gotestyourself/gotestyourself/assert/cmp"
14 
-	"golang.org/x/net/context"
15 14 
 )
16 15
17 16 
 func TestConfigUpdateUnsupported(t *testing.T) {
client/container_attach.go
History View file @ 7d62e40
... ... 
@@ -1,10 +1,10 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"net/url"
5 6
6 7 
 	"github.com/docker/docker/api/types"
7 
-	"golang.org/x/net/context"
8 8 
 )
9 9
10 10 
 // ContainerAttach attaches a connection to a container in the server.
client/container_commit.go
History View file @ 7d62e40
... ... 
@@ -1,13 +1,13 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"encoding/json"
5 6 
 	"errors"
6 7 
 	"net/url"
7 8
8 9 
 	"github.com/docker/distribution/reference"
9 10 
 	"github.com/docker/docker/api/types"
10 
-	"golang.org/x/net/context"
11 11 
 )
12 12
13 13 
 // ContainerCommit applies changes into a container and creates a new tagged image.
client/container_commit_test.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"encoding/json"
6 7 
 	"fmt"
7 8 
 	"io/ioutil"
... ... 
@@ -10,7 +11,6 @@ import (
10 10 
 	"testing"
11 11
12 12 
 	"github.com/docker/docker/api/types"
13 
-	"golang.org/x/net/context"
14 13 
 )
15 14
16 15 
 func TestContainerCommitError(t *testing.T) {
client/container_copy.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"encoding/base64"
5 6 
 	"encoding/json"
6 7 
 	"fmt"
... ... 
@@ -10,8 +11,6 @@ import (
10 10 
 	"path/filepath"
11 11 
 	"strings"
12 12
13 
-	"golang.org/x/net/context"
14 
-
15 13 
 	"github.com/docker/docker/api/types"
16 14 
 )
17 15
client/container_copy_test.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"encoding/base64"
6 7 
 	"encoding/json"
7 8 
 	"fmt"
... ... 
@@ -10,8 +11,6 @@ import (
10 10 
 	"strings"
11 11 
 	"testing"
12 12
13 
-	"golang.org/x/net/context"
14 
-
15 13 
 	"github.com/docker/docker/api/types"
16 14 
 )
17 15
client/container_create.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"encoding/json"
5 6 
 	"net/url"
6 7 
 	"strings"
... ... 
@@ -8,7 +9,6 @@ import (
8 8 
 	"github.com/docker/docker/api/types/container"
9 9 
 	"github.com/docker/docker/api/types/network"
10 10 
 	"github.com/docker/docker/api/types/versions"
11 
-	"golang.org/x/net/context"
12 11 
 )
13 12
14 13 
 type configWrapper struct {
client/container_create_test.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"encoding/json"
6 7 
 	"fmt"
7 8 
 	"io/ioutil"
... ... 
@@ -10,7 +11,6 @@ import (
10 10 
 	"testing"
11 11
12 12 
 	"github.com/docker/docker/api/types/container"
13 
-	"golang.org/x/net/context"
14 13 
 )
15 14
16 15 
 func TestContainerCreateError(t *testing.T) {
client/container_diff.go
History View file @ 7d62e40
... ... 
@@ -1,11 +1,11 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"encoding/json"
5 6 
 	"net/url"
6 7
7 8 
 	"github.com/docker/docker/api/types/container"
8 
-	"golang.org/x/net/context"
9 9 
 )
10 10
11 11 
 // ContainerDiff shows differences in a container filesystem since it was started.
client/container_diff_test.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"encoding/json"
6 7 
 	"fmt"
7 8 
 	"io/ioutil"
... ... 
@@ -10,7 +11,6 @@ import (
10 10 
 	"testing"
11 11
12 12 
 	"github.com/docker/docker/api/types/container"
13 
-	"golang.org/x/net/context"
14 13 
 )
15 14
16 15 
 func TestContainerDiffError(t *testing.T) {
client/container_exec.go
History View file @ 7d62e40
... ... 
@@ -1,10 +1,10 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"encoding/json"
5 6
6 7 
 	"github.com/docker/docker/api/types"
7 
-	"golang.org/x/net/context"
8 8 
 )
9 9
10 10 
 // ContainerExecCreate creates a new exec configuration to run an exec process.
client/container_exec_test.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"encoding/json"
6 7 
 	"fmt"
7 8 
 	"io/ioutil"
... ... 
@@ -9,8 +10,6 @@ import (
9 9 
 	"strings"
10 10 
 	"testing"
11 11
12 
-	"golang.org/x/net/context"
13 
-
14 12 
 	"github.com/docker/docker/api/types"
15 13 
 )
16 14
client/container_export.go
History View file @ 7d62e40
... ... 
@@ -1,10 +1,9 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"io"
5 6 
 	"net/url"
6 
-
7 
-	"golang.org/x/net/context"
8 7 
 )
9 8
10 9 
 // ContainerExport retrieves the raw contents of a container
client/container_export_test.go
History View file @ 7d62e40
... ... 
@@ -2,13 +2,12 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"fmt"
6 7 
 	"io/ioutil"
7 8 
 	"net/http"
8 9 
 	"strings"
9 10 
 	"testing"
10 
-
11 
-	"golang.org/x/net/context"
12 11 
 )
13 12
14 13 
 func TestContainerExportError(t *testing.T) {
client/container_inspect.go
History View file @ 7d62e40
... ... 
@@ -2,12 +2,12 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"encoding/json"
6 7 
 	"io/ioutil"
7 8 
 	"net/url"
8 9
9 10 
 	"github.com/docker/docker/api/types"
10 
-	"golang.org/x/net/context"
11 11 
 )
12 12
13 13 
 // ContainerInspect returns the container information.
client/container_inspect_test.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"encoding/json"
6 7 
 	"fmt"
7 8 
 	"io/ioutil"
... ... 
@@ -11,7 +12,6 @@ import (
11 11
12 12 
 	"github.com/docker/docker/api/types"
13 13 
 	"github.com/pkg/errors"
14 
-	"golang.org/x/net/context"
15 14 
 )
16 15
17 16 
 func TestContainerInspectError(t *testing.T) {
client/container_kill.go
History View file @ 7d62e40
... ... 
@@ -1,9 +1,8 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"net/url"
5 
-
6 
-	"golang.org/x/net/context"
7 6 
 )
8 7
9 8 
 // ContainerKill terminates the container process but does not remove the container from the docker host.
client/container_kill_test.go
History View file @ 7d62e40
... ... 
@@ -2,13 +2,12 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"fmt"
6 7 
 	"io/ioutil"
7 8 
 	"net/http"
8 9 
 	"strings"
9 10 
 	"testing"
10 
-
11 
-	"golang.org/x/net/context"
12 11 
 )
13 12
14 13 
 func TestContainerKillError(t *testing.T) {
client/container_list.go
History View file @ 7d62e40
... ... 
@@ -1,13 +1,13 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"encoding/json"
5 6 
 	"net/url"
6 7 
 	"strconv"
7 8
8 9 
 	"github.com/docker/docker/api/types"
9 10 
 	"github.com/docker/docker/api/types/filters"
10 
-	"golang.org/x/net/context"
11 11 
 )
12 12
13 13 
 // ContainerList returns the list of containers in the docker host.
client/container_list_test.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"encoding/json"
6 7 
 	"fmt"
7 8 
 	"io/ioutil"
... ... 
@@ -11,7 +12,6 @@ import (
11 11
12 12 
 	"github.com/docker/docker/api/types"
13 13 
 	"github.com/docker/docker/api/types/filters"
14 
-	"golang.org/x/net/context"
15 14 
 )
16 15
17 16 
 func TestContainerListError(t *testing.T) {
client/container_logs.go
History View file @ 7d62e40
... ... 
@@ -1,12 +1,11 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"io"
5 6 
 	"net/url"
6 7 
 	"time"
7 8
8 
-	"golang.org/x/net/context"
9 
-
10 9 
 	"github.com/docker/docker/api/types"
11 10 
 	timetypes "github.com/docker/docker/api/types/time"
12 11 
 )
client/container_logs_test.go
History View file @ 7d62e40
... ... 
@@ -12,10 +12,10 @@ import (
12 12 
 	"testing"
13 13 
 	"time"
14 14
15 
+	"context"
16 
+
15 17 
 	"github.com/docker/docker/api/types"
16 18 
 	"github.com/docker/docker/internal/testutil"
17 
-
18 
-	"golang.org/x/net/context"
19 19 
 )
20 20
21 21 
 func TestContainerLogsNotFoundError(t *testing.T) {
client/container_pause.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,6 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 
-import "golang.org/x/net/context"
3 
+import "context"
4 4
5 5 
 // ContainerPause pauses the main process of a given container without terminating it.
6 6 
 func (cli *Client) ContainerPause(ctx context.Context, containerID string) error {
client/container_pause_test.go
History View file @ 7d62e40
... ... 
@@ -2,13 +2,12 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"fmt"
6 7 
 	"io/ioutil"
7 8 
 	"net/http"
8 9 
 	"strings"
9 10 
 	"testing"
10 
-
11 
-	"golang.org/x/net/context"
12 11 
 )
13 12
14 13 
 func TestContainerPauseError(t *testing.T) {
client/container_prune.go
History View file @ 7d62e40
... ... 
@@ -1,12 +1,12 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"encoding/json"
5 6 
 	"fmt"
6 7
7 8 
 	"github.com/docker/docker/api/types"
8 9 
 	"github.com/docker/docker/api/types/filters"
9 
-	"golang.org/x/net/context"
10 10 
 )
11 11
12 12 
 // ContainersPrune requests the daemon to delete unused data
client/container_prune_test.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"encoding/json"
6 7 
 	"fmt"
7 8 
 	"io/ioutil"
... ... 
@@ -13,7 +14,6 @@ import (
13 13 
 	"github.com/docker/docker/api/types/filters"
14 14 
 	"github.com/gotestyourself/gotestyourself/assert"
15 15 
 	is "github.com/gotestyourself/gotestyourself/assert/cmp"
16 
-	"golang.org/x/net/context"
17 16 
 )
18 17
19 18 
 func TestContainersPruneError(t *testing.T) {
client/container_remove.go
History View file @ 7d62e40
... ... 
@@ -1,10 +1,10 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"net/url"
5 6
6 7 
 	"github.com/docker/docker/api/types"
7 
-	"golang.org/x/net/context"
8 8 
 )
9 9
10 10 
 // ContainerRemove kills and removes a container from the docker host.
client/container_remove_test.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"fmt"
6 7 
 	"io/ioutil"
7 8 
 	"net/http"
... ... 
@@ -11,7 +12,6 @@ import (
11 11 
 	"github.com/docker/docker/api/types"
12 12 
 	"github.com/gotestyourself/gotestyourself/assert"
13 13 
 	is "github.com/gotestyourself/gotestyourself/assert/cmp"
14 
-	"golang.org/x/net/context"
15 14 
 )
16 15
17 16 
 func TestContainerRemoveError(t *testing.T) {
client/container_rename.go
History View file @ 7d62e40
... ... 
@@ -1,9 +1,8 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"net/url"
5 
-
6 
-	"golang.org/x/net/context"
7 6 
 )
8 7
9 8 
 // ContainerRename changes the name of a given container.
client/container_rename_test.go
History View file @ 7d62e40
... ... 
@@ -2,13 +2,12 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"fmt"
6 7 
 	"io/ioutil"
7 8 
 	"net/http"
8 9 
 	"strings"
9 10 
 	"testing"
10 
-
11 
-	"golang.org/x/net/context"
12 11 
 )
13 12
14 13 
 func TestContainerRenameError(t *testing.T) {
client/container_resize.go
History View file @ 7d62e40
... ... 
@@ -1,11 +1,11 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"net/url"
5 6 
 	"strconv"
6 7
7 8 
 	"github.com/docker/docker/api/types"
8 
-	"golang.org/x/net/context"
9 9 
 )
10 10
11 11 
 // ContainerResize changes the size of the tty for a container.
client/container_resize_test.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"fmt"
6 7 
 	"io/ioutil"
7 8 
 	"net/http"
... ... 
@@ -9,7 +10,6 @@ import (
9 9 
 	"testing"
10 10
11 11 
 	"github.com/docker/docker/api/types"
12 
-	"golang.org/x/net/context"
13 12 
 )
14 13
15 14 
 func TestContainerResizeError(t *testing.T) {
client/container_restart.go
History View file @ 7d62e40
... ... 
@@ -1,11 +1,11 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"net/url"
5 6 
 	"time"
6 7
7 8 
 	timetypes "github.com/docker/docker/api/types/time"
8 
-	"golang.org/x/net/context"
9 9 
 )
10 10
11 11 
 // ContainerRestart stops and starts a container again.
client/container_restart_test.go
History View file @ 7d62e40
... ... 
@@ -2,14 +2,13 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"fmt"
6 7 
 	"io/ioutil"
7 8 
 	"net/http"
8 9 
 	"strings"
9 10 
 	"testing"
10 11 
 	"time"
11 
-
12 
-	"golang.org/x/net/context"
13 12 
 )
14 13
15 14 
 func TestContainerRestartError(t *testing.T) {
client/container_start.go
History View file @ 7d62e40
... ... 
@@ -1,10 +1,9 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"net/url"
5 6
6 
-	"golang.org/x/net/context"
7 
-
8 7 
 	"github.com/docker/docker/api/types"
9 8 
 )
10 9
client/container_start_test.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"encoding/json"
6 7 
 	"fmt"
7 8 
 	"io/ioutil"
... ... 
@@ -9,8 +10,6 @@ import (
9 9 
 	"strings"
10 10 
 	"testing"
11 11
12 
-	"golang.org/x/net/context"
13 
-
14 12 
 	"github.com/docker/docker/api/types"
15 13 
 )
16 14
client/container_stats.go
History View file @ 7d62e40
... ... 
@@ -1,10 +1,10 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"net/url"
5 6
6 7 
 	"github.com/docker/docker/api/types"
7 
-	"golang.org/x/net/context"
8 8 
 )
9 9
10 10 
 // ContainerStats returns near realtime stats for a given container.
client/container_stats_test.go
History View file @ 7d62e40
... ... 
@@ -2,13 +2,12 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"fmt"
6 7 
 	"io/ioutil"
7 8 
 	"net/http"
8 9 
 	"strings"
9 10 
 	"testing"
10 
-
11 
-	"golang.org/x/net/context"
12 11 
 )
13 12
14 13 
 func TestContainerStatsError(t *testing.T) {
client/container_stop.go
History View file @ 7d62e40
... ... 
@@ -1,11 +1,11 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"net/url"
5 6 
 	"time"
6 7
7 8 
 	timetypes "github.com/docker/docker/api/types/time"
8 
-	"golang.org/x/net/context"
9 9 
 )
10 10
11 11 
 // ContainerStop stops a container without terminating the process.
client/container_stop_test.go
History View file @ 7d62e40
... ... 
@@ -2,14 +2,13 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"fmt"
6 7 
 	"io/ioutil"
7 8 
 	"net/http"
8 9 
 	"strings"
9 10 
 	"testing"
10 11 
 	"time"
11 
-
12 
-	"golang.org/x/net/context"
13 12 
 )
14 13
15 14 
 func TestContainerStopError(t *testing.T) {
client/container_top.go
History View file @ 7d62e40
... ... 
@@ -1,12 +1,12 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"encoding/json"
5 6 
 	"net/url"
6 7 
 	"strings"
7 8
8 9 
 	"github.com/docker/docker/api/types/container"
9 
-	"golang.org/x/net/context"
10 10 
 )
11 11
12 12 
 // ContainerTop shows process information from within a container.
client/container_top_test.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"encoding/json"
6 7 
 	"fmt"
7 8 
 	"io/ioutil"
... ... 
@@ -11,7 +12,6 @@ import (
11 11 
 	"testing"
12 12
13 13 
 	"github.com/docker/docker/api/types/container"
14 
-	"golang.org/x/net/context"
15 14 
 )
16 15
17 16 
 func TestContainerTopError(t *testing.T) {
client/container_unpause.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,6 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 
-import "golang.org/x/net/context"
3 
+import "context"
4 4
5 5 
 // ContainerUnpause resumes the process execution within a container
6 6 
 func (cli *Client) ContainerUnpause(ctx context.Context, containerID string) error {
client/container_unpause_test.go
History View file @ 7d62e40
... ... 
@@ -2,13 +2,12 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"fmt"
6 7 
 	"io/ioutil"
7 8 
 	"net/http"
8 9 
 	"strings"
9 10 
 	"testing"
10 
-
11 
-	"golang.org/x/net/context"
12 11 
 )
13 12
14 13 
 func TestContainerUnpauseError(t *testing.T) {
client/container_update.go
History View file @ 7d62e40
... ... 
@@ -1,10 +1,10 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"encoding/json"
5 6
6 7 
 	"github.com/docker/docker/api/types/container"
7 
-	"golang.org/x/net/context"
8 8 
 )
9 9
10 10 
 // ContainerUpdate updates resources of a container
client/container_update_test.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"encoding/json"
6 7 
 	"fmt"
7 8 
 	"io/ioutil"
... ... 
@@ -10,7 +11,6 @@ import (
10 10 
 	"testing"
11 11
12 12 
 	"github.com/docker/docker/api/types/container"
13 
-	"golang.org/x/net/context"
14 13 
 )
15 14
16 15 
 func TestContainerUpdateError(t *testing.T) {
client/container_wait.go
History View file @ 7d62e40
... ... 
@@ -1,11 +1,10 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"encoding/json"
5 6 
 	"net/url"
6 7
7 
-	"golang.org/x/net/context"
8 
-
9 8 
 	"github.com/docker/docker/api/types/container"
10 9 
 	"github.com/docker/docker/api/types/versions"
11 10 
 )
client/container_wait_test.go
History View file @ 7d62e40
... ... 
@@ -11,9 +11,9 @@ import (
11 11 
 	"testing"
12 12 
 	"time"
13 13
14 
-	"github.com/docker/docker/api/types/container"
14 
+	"context"
15 15
16 
-	"golang.org/x/net/context"
16 
+	"github.com/docker/docker/api/types/container"
17 17 
 )
18 18
19 19 
 func TestContainerWaitError(t *testing.T) {
client/disk_usage.go
History View file @ 7d62e40
... ... 
@@ -1,11 +1,11 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"encoding/json"
5 6 
 	"fmt"
6 7
7 8 
 	"github.com/docker/docker/api/types"
8 
-	"golang.org/x/net/context"
9 9 
 )
10 10
11 11 
 // DiskUsage requests the current data usage from the daemon
client/disk_usage_test.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"encoding/json"
6 7 
 	"fmt"
7 8 
 	"io/ioutil"
... ... 
@@ -10,7 +11,6 @@ import (
10 10 
 	"testing"
11 11
12 12 
 	"github.com/docker/docker/api/types"
13 
-	"golang.org/x/net/context"
14 13 
 )
15 14
16 15 
 func TestDiskUsageError(t *testing.T) {
client/distribution_inspect.go
History View file @ 7d62e40
... ... 
@@ -1,11 +1,11 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"encoding/json"
5 6 
 	"net/url"
6 7
7 8 
 	registrytypes "github.com/docker/docker/api/types/registry"
8 
-	"golang.org/x/net/context"
9 9 
 )
10 10
11 11 
 // DistributionInspect returns the image digest with full Manifest
client/distribution_inspect_test.go
History View file @ 7d62e40
... ... 
@@ -1,13 +1,13 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"net/http"
5 6 
 	"testing"
6 7
7 8 
 	"github.com/gotestyourself/gotestyourself/assert"
8 9 
 	is "github.com/gotestyourself/gotestyourself/assert/cmp"
9 10 
 	"github.com/pkg/errors"
10 
-	"golang.org/x/net/context"
11 11 
 )
12 12
13 13 
 func TestDistributionInspectUnsupported(t *testing.T) {
client/events.go
History View file @ 7d62e40
... ... 
@@ -1,12 +1,11 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"encoding/json"
5 6 
 	"net/url"
6 7 
 	"time"
7 8
8 
-	"golang.org/x/net/context"
9 
-
10 9 
 	"github.com/docker/docker/api/types"
11 10 
 	"github.com/docker/docker/api/types/events"
12 11 
 	"github.com/docker/docker/api/types/filters"
client/events_test.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"encoding/json"
6 7 
 	"fmt"
7 8 
 	"io"
... ... 
@@ -10,8 +11,6 @@ import (
10 10 
 	"strings"
11 11 
 	"testing"
12 12
13 
-	"golang.org/x/net/context"
14 
-
15 13 
 	"github.com/docker/docker/api/types"
16 14 
 	"github.com/docker/docker/api/types/events"
17 15 
 	"github.com/docker/docker/api/types/filters"
client/hijack.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bufio"
5 
+	"context"
5 6 
 	"crypto/tls"
6 7 
 	"fmt"
7 8 
 	"net"
... ... 
@@ -14,7 +15,6 @@ import (
14 14 
 	"github.com/docker/docker/api/types"
15 15 
 	"github.com/docker/go-connections/sockets"
16 16 
 	"github.com/pkg/errors"
17 
-	"golang.org/x/net/context"
18 17 
 )
19 18
20 19 
 // tlsClientCon holds tls information and a dialed connection.
client/image_build.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"encoding/base64"
5 6 
 	"encoding/json"
6 7 
 	"io"
... ... 
@@ -9,8 +10,6 @@ import (
9 9 
 	"strconv"
10 10 
 	"strings"
11 11
12 
-	"golang.org/x/net/context"
13 
-
14 12 
 	"github.com/docker/docker/api/types"
15 13 
 	"github.com/docker/docker/api/types/container"
16 14 
 )
client/image_build_test.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"fmt"
6 7 
 	"io/ioutil"
7 8 
 	"net/http"
... ... 
@@ -9,8 +10,6 @@ import (
9 9 
 	"strings"
10 10 
 	"testing"
11 11
12 
-	"golang.org/x/net/context"
13 
-
14 12 
 	"github.com/docker/docker/api/types"
15 13 
 	"github.com/docker/docker/api/types/container"
16 14 
 	"github.com/docker/go-units"
client/image_create.go
History View file @ 7d62e40
... ... 
@@ -1,12 +1,11 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"io"
5 6 
 	"net/url"
6 7 
 	"strings"
7 8
8 
-	"golang.org/x/net/context"
9 
-
10 9 
 	"github.com/docker/distribution/reference"
11 10 
 	"github.com/docker/docker/api/types"
12 11 
 )
client/image_create_test.go
History View file @ 7d62e40
... ... 
@@ -2,14 +2,13 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"fmt"
6 7 
 	"io/ioutil"
7 8 
 	"net/http"
8 9 
 	"strings"
9 10 
 	"testing"
10 11
11 
-	"golang.org/x/net/context"
12 
-
13 12 
 	"github.com/docker/docker/api/types"
14 13 
 )
15 14
client/image_history.go
History View file @ 7d62e40
... ... 
@@ -1,11 +1,11 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"encoding/json"
5 6 
 	"net/url"
6 7
7 8 
 	"github.com/docker/docker/api/types/image"
8 
-	"golang.org/x/net/context"
9 9 
 )
10 10
11 11 
 // ImageHistory returns the changes in an image in history format.
client/image_history_test.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"encoding/json"
6 7 
 	"fmt"
7 8 
 	"io/ioutil"
... ... 
@@ -10,7 +11,6 @@ import (
10 10 
 	"testing"
11 11
12 12 
 	"github.com/docker/docker/api/types/image"
13 
-	"golang.org/x/net/context"
14 13 
 )
15 14
16 15 
 func TestImageHistoryError(t *testing.T) {
client/image_import.go
History View file @ 7d62e40
... ... 
@@ -1,12 +1,11 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"io"
5 6 
 	"net/url"
6 7 
 	"strings"
7 8
8 
-	"golang.org/x/net/context"
9 
-
10 9 
 	"github.com/docker/distribution/reference"
11 10 
 	"github.com/docker/docker/api/types"
12 11 
 )
client/image_import_test.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"fmt"
6 7 
 	"io/ioutil"
7 8 
 	"net/http"
... ... 
@@ -10,7 +11,6 @@ import (
10 10 
 	"testing"
11 11
12 12 
 	"github.com/docker/docker/api/types"
13 
-	"golang.org/x/net/context"
14 13 
 )
15 14
16 15 
 func TestImageImportError(t *testing.T) {
client/image_inspect.go
History View file @ 7d62e40
... ... 
@@ -2,11 +2,11 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"encoding/json"
6 7 
 	"io/ioutil"
7 8
8 9 
 	"github.com/docker/docker/api/types"
9 
-	"golang.org/x/net/context"
10 10 
 )
11 11
12 12 
 // ImageInspectWithRaw returns the image information and its raw representation.
client/image_inspect_test.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"encoding/json"
6 7 
 	"fmt"
7 8 
 	"io/ioutil"
... ... 
@@ -12,7 +13,6 @@ import (
12 12
13 13 
 	"github.com/docker/docker/api/types"
14 14 
 	"github.com/pkg/errors"
15 
-	"golang.org/x/net/context"
16 15 
 )
17 16
18 17 
 func TestImageInspectError(t *testing.T) {
client/image_list.go
History View file @ 7d62e40
... ... 
@@ -1,13 +1,13 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"encoding/json"
5 6 
 	"net/url"
6 7
7 8 
 	"github.com/docker/docker/api/types"
8 9 
 	"github.com/docker/docker/api/types/filters"
9 10 
 	"github.com/docker/docker/api/types/versions"
10 
-	"golang.org/x/net/context"
11 11 
 )
12 12
13 13 
 // ImageList returns a list of images in the docker host.
client/image_list_test.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"encoding/json"
6 7 
 	"fmt"
7 8 
 	"io/ioutil"
... ... 
@@ -11,7 +12,6 @@ import (
11 11
12 12 
 	"github.com/docker/docker/api/types"
13 13 
 	"github.com/docker/docker/api/types/filters"
14 
-	"golang.org/x/net/context"
15 14 
 )
16 15
17 16 
 func TestImageListError(t *testing.T) {
client/image_load.go
History View file @ 7d62e40
... ... 
@@ -1,11 +1,10 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"io"
5 6 
 	"net/url"
6 7
7 
-	"golang.org/x/net/context"
8 
-
9 8 
 	"github.com/docker/docker/api/types"
10 9 
 )
11 10
client/image_load_test.go
History View file @ 7d62e40
... ... 
@@ -2,13 +2,12 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"fmt"
6 7 
 	"io/ioutil"
7 8 
 	"net/http"
8 9 
 	"strings"
9 10 
 	"testing"
10 
-
11 
-	"golang.org/x/net/context"
12 11 
 )
13 12
14 13 
 func TestImageLoadError(t *testing.T) {
client/image_prune.go
History View file @ 7d62e40
... ... 
@@ -1,12 +1,12 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"encoding/json"
5 6 
 	"fmt"
6 7
7 8 
 	"github.com/docker/docker/api/types"
8 9 
 	"github.com/docker/docker/api/types/filters"
9 
-	"golang.org/x/net/context"
10 10 
 )
11 11
12 12 
 // ImagesPrune requests the daemon to delete unused data
client/image_prune_test.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"encoding/json"
6 7 
 	"fmt"
7 8 
 	"io/ioutil"
... ... 
@@ -13,7 +14,6 @@ import (
13 13 
 	"github.com/docker/docker/api/types/filters"
14 14 
 	"github.com/gotestyourself/gotestyourself/assert"
15 15 
 	is "github.com/gotestyourself/gotestyourself/assert/cmp"
16 
-	"golang.org/x/net/context"
17 16 
 )
18 17
19 18 
 func TestImagesPruneError(t *testing.T) {
client/image_pull.go
History View file @ 7d62e40
... ... 
@@ -1,13 +1,12 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"io"
5 6 
 	"net/http"
6 7 
 	"net/url"
7 8 
 	"strings"
8 9
9 
-	"golang.org/x/net/context"
10 
-
11 10 
 	"github.com/docker/distribution/reference"
12 11 
 	"github.com/docker/docker/api/types"
13 12 
 )
client/image_pull_test.go
History View file @ 7d62e40
... ... 
@@ -2,14 +2,13 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"fmt"
6 7 
 	"io/ioutil"
7 8 
 	"net/http"
8 9 
 	"strings"
9 10 
 	"testing"
10 11
11 
-	"golang.org/x/net/context"
12 
-
13 12 
 	"github.com/docker/docker/api/types"
14 13 
 )
15 14
client/image_push.go
History View file @ 7d62e40
... ... 
@@ -1,13 +1,12 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"errors"
5 6 
 	"io"
6 7 
 	"net/http"
7 8 
 	"net/url"
8 9
9 
-	"golang.org/x/net/context"
10 
-
11 10 
 	"github.com/docker/distribution/reference"
12 11 
 	"github.com/docker/docker/api/types"
13 12 
 )
client/image_push_test.go
History View file @ 7d62e40
... ... 
@@ -2,14 +2,13 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"fmt"
6 7 
 	"io/ioutil"
7 8 
 	"net/http"
8 9 
 	"strings"
9 10 
 	"testing"
10 11
11 
-	"golang.org/x/net/context"
12 
-
13 12 
 	"github.com/docker/docker/api/types"
14 13 
 )
15 14
client/image_remove.go
History View file @ 7d62e40
... ... 
@@ -1,11 +1,11 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"encoding/json"
5 6 
 	"net/url"
6 7
7 8 
 	"github.com/docker/docker/api/types"
8 
-	"golang.org/x/net/context"
9 9 
 )
10 10
11 11 
 // ImageRemove removes an image from the docker host.
client/image_remove_test.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"encoding/json"
6 7 
 	"fmt"
7 8 
 	"io/ioutil"
... ... 
@@ -12,7 +13,6 @@ import (
12 12 
 	"github.com/docker/docker/api/types"
13 13 
 	"github.com/gotestyourself/gotestyourself/assert"
14 14 
 	is "github.com/gotestyourself/gotestyourself/assert/cmp"
15 
-	"golang.org/x/net/context"
16 15 
 )
17 16
18 17 
 func TestImageRemoveError(t *testing.T) {
client/image_save.go
History View file @ 7d62e40
... ... 
@@ -1,10 +1,9 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"io"
5 6 
 	"net/url"
6 
-
7 
-	"golang.org/x/net/context"
8 7 
 )
9 8
10 9 
 // ImageSave retrieves one or more images from the docker host as an io.ReadCloser.
client/image_save_test.go
History View file @ 7d62e40
... ... 
@@ -2,14 +2,13 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"fmt"
6 7 
 	"io/ioutil"
7 8 
 	"net/http"
8 9 
 	"reflect"
9 10 
 	"testing"
10 11
11 
-	"golang.org/x/net/context"
12 
-
13 12 
 	"strings"
14 13 
 )
15 14
client/image_search.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"encoding/json"
5 6 
 	"fmt"
6 7 
 	"net/http"
... ... 
@@ -9,7 +10,6 @@ import (
9 9 
 	"github.com/docker/docker/api/types"
10 10 
 	"github.com/docker/docker/api/types/filters"
11 11 
 	"github.com/docker/docker/api/types/registry"
12 
-	"golang.org/x/net/context"
13 12 
 )
14 13
15 14 
 // ImageSearch makes the docker host to search by a term in a remote registry.
client/image_search_test.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"encoding/json"
6 7 
 	"fmt"
7 8 
 	"io/ioutil"
... ... 
@@ -12,7 +13,6 @@ import (
12 12 
 	"github.com/docker/docker/api/types"
13 13 
 	"github.com/docker/docker/api/types/filters"
14 14 
 	"github.com/docker/docker/api/types/registry"
15 
-	"golang.org/x/net/context"
16 15 
 )
17 16
18 17 
 func TestImageSearchAnyError(t *testing.T) {
client/image_tag.go
History View file @ 7d62e40
... ... 
@@ -1,11 +1,11 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"net/url"
5 6
6 7 
 	"github.com/docker/distribution/reference"
7 8 
 	"github.com/pkg/errors"
8 
-	"golang.org/x/net/context"
9 9 
 )
10 10
11 11 
 // ImageTag tags an image in the docker host
client/image_tag_test.go
History View file @ 7d62e40
... ... 
@@ -2,13 +2,12 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"fmt"
6 7 
 	"io/ioutil"
7 8 
 	"net/http"
8 9 
 	"strings"
9 10 
 	"testing"
10 
-
11 
-	"golang.org/x/net/context"
12 11 
 )
13 12
14 13 
 func TestImageTagError(t *testing.T) {
client/info.go
History View file @ 7d62e40
... ... 
@@ -1,12 +1,12 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"encoding/json"
5 6 
 	"fmt"
6 7 
 	"net/url"
7 8
8 9 
 	"github.com/docker/docker/api/types"
9 
-	"golang.org/x/net/context"
10 10 
 )
11 11
12 12 
 // Info returns information about the docker server.
client/info_test.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"encoding/json"
6 7 
 	"fmt"
7 8 
 	"io/ioutil"
... ... 
@@ -10,7 +11,6 @@ import (
10 10 
 	"testing"
11 11
12 12 
 	"github.com/docker/docker/api/types"
13 
-	"golang.org/x/net/context"
14 13 
 )
15 14
16 15 
 func TestInfoServerError(t *testing.T) {
client/interface.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"io"
5 6 
 	"net"
6 7 
 	"time"
... ... 
@@ -14,7 +15,6 @@ import (
14 14 
 	"github.com/docker/docker/api/types/registry"
15 15 
 	"github.com/docker/docker/api/types/swarm"
16 16 
 	volumetypes "github.com/docker/docker/api/types/volume"
17 
-	"golang.org/x/net/context"
18 17 
 )
19 18
20 19 
 // CommonAPIClient is the common methods between stable and experimental versions of APIClient.
client/interface_experimental.go
History View file @ 7d62e40
... ... 
@@ -1,8 +1,9 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
5 
+
4 6 
 	"github.com/docker/docker/api/types"
5 
-	"golang.org/x/net/context"
6 7 
 )
7 8
8 9 
 type apiClientExperimental interface {
client/login.go
History View file @ 7d62e40
... ... 
@@ -1,13 +1,13 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"encoding/json"
5 6 
 	"net/http"
6 7 
 	"net/url"
7 8
8 9 
 	"github.com/docker/docker/api/types"
9 10 
 	"github.com/docker/docker/api/types/registry"
10 
-	"golang.org/x/net/context"
11 11 
 )
12 12
13 13 
 // RegistryLogin authenticates the docker server with a given docker registry.
client/network_connect.go
History View file @ 7d62e40
... ... 
@@ -1,9 +1,10 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
5 
+
4 6 
 	"github.com/docker/docker/api/types"
5 7 
 	"github.com/docker/docker/api/types/network"
6 
-	"golang.org/x/net/context"
7 8 
 )
8 9
9 10 
 // NetworkConnect connects a container to an existent network in the docker host.
client/network_connect_test.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"encoding/json"
6 7 
 	"fmt"
7 8 
 	"io/ioutil"
... ... 
@@ -9,8 +10,6 @@ import (
9 9 
 	"strings"
10 10 
 	"testing"
11 11
12 
-	"golang.org/x/net/context"
13 
-
14 12 
 	"github.com/docker/docker/api/types"
15 13 
 	"github.com/docker/docker/api/types/network"
16 14 
 )
client/network_create.go
History View file @ 7d62e40
... ... 
@@ -1,10 +1,10 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"encoding/json"
5 6
6 7 
 	"github.com/docker/docker/api/types"
7 
-	"golang.org/x/net/context"
8 8 
 )
9 9
10 10 
 // NetworkCreate creates a new network in the docker host.
client/network_create_test.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"encoding/json"
6 7 
 	"fmt"
7 8 
 	"io/ioutil"
... ... 
@@ -10,7 +11,6 @@ import (
10 10 
 	"testing"
11 11
12 12 
 	"github.com/docker/docker/api/types"
13 
-	"golang.org/x/net/context"
14 13 
 )
15 14
16 15 
 func TestNetworkCreateError(t *testing.T) {
client/network_disconnect.go
History View file @ 7d62e40
... ... 
@@ -1,8 +1,9 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
5 
+
4 6 
 	"github.com/docker/docker/api/types"
5 
-	"golang.org/x/net/context"
6 7 
 )
7 8
8 9 
 // NetworkDisconnect disconnects a container from an existent network in the docker host.
client/network_disconnect_test.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"encoding/json"
6 7 
 	"fmt"
7 8 
 	"io/ioutil"
... ... 
@@ -10,7 +11,6 @@ import (
10 10 
 	"testing"
11 11
12 12 
 	"github.com/docker/docker/api/types"
13 
-	"golang.org/x/net/context"
14 13 
 )
15 14
16 15 
 func TestNetworkDisconnectError(t *testing.T) {
client/network_inspect.go
History View file @ 7d62e40
... ... 
@@ -2,12 +2,12 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"encoding/json"
6 7 
 	"io/ioutil"
7 8 
 	"net/url"
8 9
9 10 
 	"github.com/docker/docker/api/types"
10 
-	"golang.org/x/net/context"
11 11 
 )
12 12
13 13 
 // NetworkInspect returns the information for a specific network configured in the docker host.
client/network_inspect_test.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"encoding/json"
6 7 
 	"fmt"
7 8 
 	"io/ioutil"
... ... 
@@ -14,7 +15,6 @@ import (
14 14 
 	"github.com/gotestyourself/gotestyourself/assert"
15 15 
 	is "github.com/gotestyourself/gotestyourself/assert/cmp"
16 16 
 	"github.com/pkg/errors"
17 
-	"golang.org/x/net/context"
18 17 
 )
19 18
20 19 
 func TestNetworkInspectError(t *testing.T) {
client/network_list.go
History View file @ 7d62e40
... ... 
@@ -1,12 +1,12 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"encoding/json"
5 6 
 	"net/url"
6 7
7 8 
 	"github.com/docker/docker/api/types"
8 9 
 	"github.com/docker/docker/api/types/filters"
9 
-	"golang.org/x/net/context"
10 10 
 )
11 11
12 12 
 // NetworkList returns the list of networks configured in the docker host.
client/network_list_test.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"encoding/json"
6 7 
 	"fmt"
7 8 
 	"io/ioutil"
... ... 
@@ -11,7 +12,6 @@ import (
11 11
12 12 
 	"github.com/docker/docker/api/types"
13 13 
 	"github.com/docker/docker/api/types/filters"
14 
-	"golang.org/x/net/context"
15 14 
 )
16 15
17 16 
 func TestNetworkListError(t *testing.T) {
client/network_prune.go
History View file @ 7d62e40
... ... 
@@ -1,12 +1,12 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"encoding/json"
5 6 
 	"fmt"
6 7
7 8 
 	"github.com/docker/docker/api/types"
8 9 
 	"github.com/docker/docker/api/types/filters"
9 
-	"golang.org/x/net/context"
10 10 
 )
11 11
12 12 
 // NetworksPrune requests the daemon to delete unused networks
client/network_prune_test.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"encoding/json"
6 7 
 	"fmt"
7 8 
 	"io/ioutil"
... ... 
@@ -13,7 +14,6 @@ import (
13 13 
 	"github.com/docker/docker/api/types/filters"
14 14 
 	"github.com/gotestyourself/gotestyourself/assert"
15 15 
 	is "github.com/gotestyourself/gotestyourself/assert/cmp"
16 
-	"golang.org/x/net/context"
17 16 
 )
18 17
19 18 
 func TestNetworksPruneError(t *testing.T) {
client/network_remove.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,6 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 
-import "golang.org/x/net/context"
3 
+import "context"
4 4
5 5 
 // NetworkRemove removes an existent network from the docker host.
6 6 
 func (cli *Client) NetworkRemove(ctx context.Context, networkID string) error {
client/network_remove_test.go
History View file @ 7d62e40
... ... 
@@ -2,13 +2,12 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"fmt"
6 7 
 	"io/ioutil"
7 8 
 	"net/http"
8 9 
 	"strings"
9 10 
 	"testing"
10 
-
11 
-	"golang.org/x/net/context"
12 11 
 )
13 12
14 13 
 func TestNetworkRemoveError(t *testing.T) {
client/node_inspect.go
History View file @ 7d62e40
... ... 
@@ -2,11 +2,11 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"encoding/json"
6 7 
 	"io/ioutil"
7 8
8 9 
 	"github.com/docker/docker/api/types/swarm"
9 
-	"golang.org/x/net/context"
10 10 
 )
11 11
12 12 
 // NodeInspectWithRaw returns the node information.
client/node_inspect_test.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"encoding/json"
6 7 
 	"fmt"
7 8 
 	"io/ioutil"
... ... 
@@ -11,7 +12,6 @@ import (
11 11
12 12 
 	"github.com/docker/docker/api/types/swarm"
13 13 
 	"github.com/pkg/errors"
14 
-	"golang.org/x/net/context"
15 14 
 )
16 15
17 16 
 func TestNodeInspectError(t *testing.T) {
client/node_list.go
History View file @ 7d62e40
... ... 
@@ -1,13 +1,13 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"encoding/json"
5 6 
 	"net/url"
6 7
7 8 
 	"github.com/docker/docker/api/types"
8 9 
 	"github.com/docker/docker/api/types/filters"
9 10 
 	"github.com/docker/docker/api/types/swarm"
10 
-	"golang.org/x/net/context"
11 11 
 )
12 12
13 13 
 // NodeList returns the list of nodes.
client/node_list_test.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"encoding/json"
6 7 
 	"fmt"
7 8 
 	"io/ioutil"
... ... 
@@ -12,7 +13,6 @@ import (
12 12 
 	"github.com/docker/docker/api/types"
13 13 
 	"github.com/docker/docker/api/types/filters"
14 14 
 	"github.com/docker/docker/api/types/swarm"
15 
-	"golang.org/x/net/context"
16 15 
 )
17 16
18 17 
 func TestNodeListError(t *testing.T) {
client/node_remove.go
History View file @ 7d62e40
... ... 
@@ -3,9 +3,9 @@ package client // import "github.com/docker/docker/client"
3 3 
 import (
4 4 
 	"net/url"
5 5
6 
-	"github.com/docker/docker/api/types"
6 
+	"context"
7 7
8 
-	"golang.org/x/net/context"
8 
+	"github.com/docker/docker/api/types"
9 9 
 )
10 10
11 11 
 // NodeRemove removes a Node.
client/node_remove_test.go
History View file @ 7d62e40
... ... 
@@ -8,9 +8,9 @@ import (
8 8 
 	"strings"
9 9 
 	"testing"
10 10
11 
-	"github.com/docker/docker/api/types"
11 
+	"context"
12 12
13 
-	"golang.org/x/net/context"
13 
+	"github.com/docker/docker/api/types"
14 14 
 )
15 15
16 16 
 func TestNodeRemoveError(t *testing.T) {
client/node_update.go
History View file @ 7d62e40
... ... 
@@ -1,11 +1,11 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"net/url"
5 6 
 	"strconv"
6 7
7 8 
 	"github.com/docker/docker/api/types/swarm"
8 
-	"golang.org/x/net/context"
9 9 
 )
10 10
11 11 
 // NodeUpdate updates a Node.
client/node_update_test.go
History View file @ 7d62e40
... ... 
@@ -2,14 +2,13 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"fmt"
6 7 
 	"io/ioutil"
7 8 
 	"net/http"
8 9 
 	"strings"
9 10 
 	"testing"
10 11
11 
-	"golang.org/x/net/context"
12 
-
13 12 
 	"github.com/docker/docker/api/types/swarm"
14 13 
 )
15 14
client/ping.go
History View file @ 7d62e40
... ... 
@@ -1,10 +1,10 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"path"
5 6
6 7 
 	"github.com/docker/docker/api/types"
7 
-	"golang.org/x/net/context"
8 8 
 )
9 9
10 10 
 // Ping pings the server and returns the value of the "Docker-Experimental", "OS-Type" & "API-Version" headers
client/ping_test.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"errors"
5 6 
 	"io/ioutil"
6 7 
 	"net/http"
... ... 
@@ -9,7 +10,6 @@ import (
9 9
10 10 
 	"github.com/gotestyourself/gotestyourself/assert"
11 11 
 	is "github.com/gotestyourself/gotestyourself/assert/cmp"
12 
-	"golang.org/x/net/context"
13 12 
 )
14 13
15 14 
 // TestPingFail tests that when a server sends a non-successful response that we
client/plugin_create.go
History View file @ 7d62e40
... ... 
@@ -1,12 +1,12 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"io"
5 6 
 	"net/http"
6 7 
 	"net/url"
7 8
8 9 
 	"github.com/docker/docker/api/types"
9 
-	"golang.org/x/net/context"
10 10 
 )
11 11
12 12 
 // PluginCreate creates a plugin
client/plugin_disable.go
History View file @ 7d62e40
... ... 
@@ -1,10 +1,10 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"net/url"
5 6
6 7 
 	"github.com/docker/docker/api/types"
7 
-	"golang.org/x/net/context"
8 8 
 )
9 9
10 10 
 // PluginDisable disables a plugin
client/plugin_disable_test.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"fmt"
6 7 
 	"io/ioutil"
7 8 
 	"net/http"
... ... 
@@ -9,7 +10,6 @@ import (
9 9 
 	"testing"
10 10
11 11 
 	"github.com/docker/docker/api/types"
12 
-	"golang.org/x/net/context"
13 12 
 )
14 13
15 14 
 func TestPluginDisableError(t *testing.T) {
client/plugin_enable.go
History View file @ 7d62e40
... ... 
@@ -1,11 +1,11 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"net/url"
5 6 
 	"strconv"
6 7
7 8 
 	"github.com/docker/docker/api/types"
8 
-	"golang.org/x/net/context"
9 9 
 )
10 10
11 11 
 // PluginEnable enables a plugin
client/plugin_enable_test.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"fmt"
6 7 
 	"io/ioutil"
7 8 
 	"net/http"
... ... 
@@ -9,7 +10,6 @@ import (
9 9 
 	"testing"
10 10
11 11 
 	"github.com/docker/docker/api/types"
12 
-	"golang.org/x/net/context"
13 12 
 )
14 13
15 14 
 func TestPluginEnableError(t *testing.T) {
client/plugin_inspect.go
History View file @ 7d62e40
... ... 
@@ -2,11 +2,11 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"encoding/json"
6 7 
 	"io/ioutil"
7 8
8 9 
 	"github.com/docker/docker/api/types"
9 
-	"golang.org/x/net/context"
10 10 
 )
11 11
12 12 
 // PluginInspectWithRaw inspects an existing plugin
client/plugin_inspect_test.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"encoding/json"
6 7 
 	"fmt"
7 8 
 	"io/ioutil"
... ... 
@@ -11,7 +12,6 @@ import (
11 11
12 12 
 	"github.com/docker/docker/api/types"
13 13 
 	"github.com/pkg/errors"
14 
-	"golang.org/x/net/context"
15 14 
 )
16 15
17 16 
 func TestPluginInspectError(t *testing.T) {
client/plugin_install.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"encoding/json"
5 6 
 	"io"
6 7 
 	"net/http"
... ... 
@@ -9,7 +10,6 @@ import (
9 9 
 	"github.com/docker/distribution/reference"
10 10 
 	"github.com/docker/docker/api/types"
11 11 
 	"github.com/pkg/errors"
12 
-	"golang.org/x/net/context"
13 12 
 )
14 13
15 14 
 // PluginInstall installs a plugin
client/plugin_list.go
History View file @ 7d62e40
... ... 
@@ -1,12 +1,12 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"encoding/json"
5 6 
 	"net/url"
6 7
7 8 
 	"github.com/docker/docker/api/types"
8 9 
 	"github.com/docker/docker/api/types/filters"
9 
-	"golang.org/x/net/context"
10 10 
 )
11 11
12 12 
 // PluginList returns the installed plugins
client/plugin_list_test.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"encoding/json"
6 7 
 	"fmt"
7 8 
 	"io/ioutil"
... ... 
@@ -11,7 +12,6 @@ import (
11 11
12 12 
 	"github.com/docker/docker/api/types"
13 13 
 	"github.com/docker/docker/api/types/filters"
14 
-	"golang.org/x/net/context"
15 14 
 )
16 15
17 16 
 func TestPluginListError(t *testing.T) {
client/plugin_push.go
History View file @ 7d62e40
... ... 
@@ -1,9 +1,8 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"io"
5 
-
6 
-	"golang.org/x/net/context"
7 6 
 )
8 7
9 8 
 // PluginPush pushes a plugin to a registry
client/plugin_push_test.go
History View file @ 7d62e40
... ... 
@@ -2,13 +2,12 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"fmt"
6 7 
 	"io/ioutil"
7 8 
 	"net/http"
8 9 
 	"strings"
9 10 
 	"testing"
10 
-
11 
-	"golang.org/x/net/context"
12 11 
 )
13 12
14 13 
 func TestPluginPushError(t *testing.T) {
client/plugin_remove.go
History View file @ 7d62e40
... ... 
@@ -1,10 +1,10 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"net/url"
5 6
6 7 
 	"github.com/docker/docker/api/types"
7 
-	"golang.org/x/net/context"
8 8 
 )
9 9
10 10 
 // PluginRemove removes a plugin
client/plugin_remove_test.go
History View file @ 7d62e40
... ... 
@@ -8,9 +8,9 @@ import (
8 8 
 	"strings"
9 9 
 	"testing"
10 10
11 
-	"github.com/docker/docker/api/types"
11 
+	"context"
12 12
13 
-	"golang.org/x/net/context"
13 
+	"github.com/docker/docker/api/types"
14 14 
 )
15 15
16 16 
 func TestPluginRemoveError(t *testing.T) {
client/plugin_set.go
History View file @ 7d62e40
... ... 
@@ -1,7 +1,7 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
-	"golang.org/x/net/context"
4 
+	"context"
5 5 
 )
6 6
7 7 
 // PluginSet modifies settings for an existing plugin
client/plugin_set_test.go
History View file @ 7d62e40
... ... 
@@ -2,13 +2,12 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"fmt"
6 7 
 	"io/ioutil"
7 8 
 	"net/http"
8 9 
 	"strings"
9 10 
 	"testing"
10 
-
11 
-	"golang.org/x/net/context"
12 11 
 )
13 12
14 13 
 func TestPluginSetError(t *testing.T) {
client/plugin_upgrade.go
History View file @ 7d62e40
... ... 
@@ -1,13 +1,13 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"io"
5 6 
 	"net/url"
6 7
7 8 
 	"github.com/docker/distribution/reference"
8 9 
 	"github.com/docker/docker/api/types"
9 10 
 	"github.com/pkg/errors"
10 
-	"golang.org/x/net/context"
11 11 
 )
12 12
13 13 
 // PluginUpgrade upgrades a plugin
client/request.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"encoding/json"
6 7 
 	"fmt"
7 8 
 	"io"
... ... 
@@ -15,7 +16,6 @@ import (
15 15 
 	"github.com/docker/docker/api/types"
16 16 
 	"github.com/docker/docker/api/types/versions"
17 17 
 	"github.com/pkg/errors"
18 
-	"golang.org/x/net/context"
19 18 
 	"golang.org/x/net/context/ctxhttp"
20 19 
 )
21 20
client/request_test.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"fmt"
6 7 
 	"io/ioutil"
7 8 
 	"net/http"
... ... 
@@ -10,7 +11,6 @@ import (
10 10
11 11 
 	"github.com/docker/docker/api/types"
12 12 
 	"github.com/gotestyourself/gotestyourself/assert"
13 
-	"golang.org/x/net/context"
14 13 
 )
15 14
16 15 
 // TestSetHostHeader should set fake host for local communications, set real host
client/secret_create.go
History View file @ 7d62e40
... ... 
@@ -1,11 +1,11 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"encoding/json"
5 6
6 7 
 	"github.com/docker/docker/api/types"
7 8 
 	"github.com/docker/docker/api/types/swarm"
8 
-	"golang.org/x/net/context"
9 9 
 )
10 10
11 11 
 // SecretCreate creates a new Secret.
client/secret_create_test.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"encoding/json"
6 7 
 	"fmt"
7 8 
 	"io/ioutil"
... ... 
@@ -13,7 +14,6 @@ import (
13 13 
 	"github.com/docker/docker/api/types/swarm"
14 14 
 	"github.com/gotestyourself/gotestyourself/assert"
15 15 
 	is "github.com/gotestyourself/gotestyourself/assert/cmp"
16 
-	"golang.org/x/net/context"
17 16 
 )
18 17
19 18 
 func TestSecretCreateUnsupported(t *testing.T) {
client/secret_inspect.go
History View file @ 7d62e40
... ... 
@@ -2,11 +2,11 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"encoding/json"
6 7 
 	"io/ioutil"
7 8
8 9 
 	"github.com/docker/docker/api/types/swarm"
9 
-	"golang.org/x/net/context"
10 10 
 )
11 11
12 12 
 // SecretInspectWithRaw returns the secret information with raw data
client/secret_inspect_test.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"encoding/json"
6 7 
 	"fmt"
7 8 
 	"io/ioutil"
... ... 
@@ -13,7 +14,6 @@ import (
13 13 
 	"github.com/gotestyourself/gotestyourself/assert"
14 14 
 	is "github.com/gotestyourself/gotestyourself/assert/cmp"
15 15 
 	"github.com/pkg/errors"
16 
-	"golang.org/x/net/context"
17 16 
 )
18 17
19 18 
 func TestSecretInspectUnsupported(t *testing.T) {
client/secret_list.go
History View file @ 7d62e40
... ... 
@@ -1,13 +1,13 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"encoding/json"
5 6 
 	"net/url"
6 7
7 8 
 	"github.com/docker/docker/api/types"
8 9 
 	"github.com/docker/docker/api/types/filters"
9 10 
 	"github.com/docker/docker/api/types/swarm"
10 
-	"golang.org/x/net/context"
11 11 
 )
12 12
13 13 
 // SecretList returns the list of secrets.
client/secret_list_test.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"encoding/json"
6 7 
 	"fmt"
7 8 
 	"io/ioutil"
... ... 
@@ -14,7 +15,6 @@ import (
14 14 
 	"github.com/docker/docker/api/types/swarm"
15 15 
 	"github.com/gotestyourself/gotestyourself/assert"
16 16 
 	is "github.com/gotestyourself/gotestyourself/assert/cmp"
17 
-	"golang.org/x/net/context"
18 17 
 )
19 18
20 19 
 func TestSecretListUnsupported(t *testing.T) {
client/secret_remove.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,6 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 
-import "golang.org/x/net/context"
3 
+import "context"
4 4
5 5 
 // SecretRemove removes a Secret.
6 6 
 func (cli *Client) SecretRemove(ctx context.Context, id string) error {
client/secret_remove_test.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"fmt"
6 7 
 	"io/ioutil"
7 8 
 	"net/http"
... ... 
@@ -10,7 +11,6 @@ import (
10 10
11 11 
 	"github.com/gotestyourself/gotestyourself/assert"
12 12 
 	is "github.com/gotestyourself/gotestyourself/assert/cmp"
13 
-	"golang.org/x/net/context"
14 13 
 )
15 14
16 15 
 func TestSecretRemoveUnsupported(t *testing.T) {
client/secret_update.go
History View file @ 7d62e40
... ... 
@@ -1,11 +1,11 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"net/url"
5 6 
 	"strconv"
6 7
7 8 
 	"github.com/docker/docker/api/types/swarm"
8 
-	"golang.org/x/net/context"
9 9 
 )
10 10
11 11 
 // SecretUpdate attempts to update a Secret
client/secret_update_test.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"fmt"
6 7 
 	"io/ioutil"
7 8 
 	"net/http"
... ... 
@@ -11,7 +12,6 @@ import (
11 11 
 	"github.com/docker/docker/api/types/swarm"
12 12 
 	"github.com/gotestyourself/gotestyourself/assert"
13 13 
 	is "github.com/gotestyourself/gotestyourself/assert/cmp"
14 
-	"golang.org/x/net/context"
15 14 
 )
16 15
17 16 
 func TestSecretUpdateUnsupported(t *testing.T) {
client/service_create.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"encoding/json"
5 6 
 	"fmt"
6 7 
 	"strings"
... ... 
@@ -10,7 +11,6 @@ import (
10 10 
 	"github.com/docker/docker/api/types/swarm"
11 11 
 	digest "github.com/opencontainers/go-digest"
12 12 
 	"github.com/pkg/errors"
13 
-	"golang.org/x/net/context"
14 13 
 )
15 14
16 15 
 // ServiceCreate creates a new Service.
client/service_create_test.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"encoding/json"
6 7 
 	"fmt"
7 8 
 	"io/ioutil"
... ... 
@@ -16,7 +17,6 @@ import (
16 16 
 	is "github.com/gotestyourself/gotestyourself/assert/cmp"
17 17 
 	"github.com/opencontainers/go-digest"
18 18 
 	"github.com/opencontainers/image-spec/specs-go/v1"
19 
-	"golang.org/x/net/context"
20 19 
 )
21 20
22 21 
 func TestServiceCreateError(t *testing.T) {
client/service_inspect.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"encoding/json"
6 7 
 	"fmt"
7 8 
 	"io/ioutil"
... ... 
@@ -9,7 +10,6 @@ import (
9 9
10 10 
 	"github.com/docker/docker/api/types"
11 11 
 	"github.com/docker/docker/api/types/swarm"
12 
-	"golang.org/x/net/context"
13 12 
 )
14 13
15 14 
 // ServiceInspectWithRaw returns the service information and the raw data.
client/service_inspect_test.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"encoding/json"
6 7 
 	"fmt"
7 8 
 	"io/ioutil"
... ... 
@@ -12,7 +13,6 @@ import (
12 12 
 	"github.com/docker/docker/api/types"
13 13 
 	"github.com/docker/docker/api/types/swarm"
14 14 
 	"github.com/pkg/errors"
15 
-	"golang.org/x/net/context"
16 15 
 )
17 16
18 17 
 func TestServiceInspectError(t *testing.T) {
client/service_list.go
History View file @ 7d62e40
... ... 
@@ -1,13 +1,13 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"encoding/json"
5 6 
 	"net/url"
6 7
7 8 
 	"github.com/docker/docker/api/types"
8 9 
 	"github.com/docker/docker/api/types/filters"
9 10 
 	"github.com/docker/docker/api/types/swarm"
10 
-	"golang.org/x/net/context"
11 11 
 )
12 12
13 13 
 // ServiceList returns the list of services.
client/service_list_test.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"encoding/json"
6 7 
 	"fmt"
7 8 
 	"io/ioutil"
... ... 
@@ -12,7 +13,6 @@ import (
12 12 
 	"github.com/docker/docker/api/types"
13 13 
 	"github.com/docker/docker/api/types/filters"
14 14 
 	"github.com/docker/docker/api/types/swarm"
15 
-	"golang.org/x/net/context"
16 15 
 )
17 16
18 17 
 func TestServiceListError(t *testing.T) {
client/service_logs.go
History View file @ 7d62e40
... ... 
@@ -1,12 +1,11 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"io"
5 6 
 	"net/url"
6 7 
 	"time"
7 8
8 
-	"golang.org/x/net/context"
9 
-
10 9 
 	"github.com/docker/docker/api/types"
11 10 
 	timetypes "github.com/docker/docker/api/types/time"
12 11 
 )
client/service_logs_test.go
History View file @ 7d62e40
... ... 
@@ -12,9 +12,9 @@ import (
12 12 
 	"testing"
13 13 
 	"time"
14 14
15 
-	"github.com/docker/docker/api/types"
15 
+	"context"
16 16
17 
-	"golang.org/x/net/context"
17 
+	"github.com/docker/docker/api/types"
18 18 
 )
19 19
20 20 
 func TestServiceLogsError(t *testing.T) {
client/service_remove.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,6 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 
-import "golang.org/x/net/context"
3 
+import "context"
4 4
5 5 
 // ServiceRemove kills and removes a service.
6 6 
 func (cli *Client) ServiceRemove(ctx context.Context, serviceID string) error {
client/service_remove_test.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"fmt"
6 7 
 	"io/ioutil"
7 8 
 	"net/http"
... ... 
@@ -10,7 +11,6 @@ import (
10 10
11 11 
 	"github.com/gotestyourself/gotestyourself/assert"
12 12 
 	is "github.com/gotestyourself/gotestyourself/assert/cmp"
13 
-	"golang.org/x/net/context"
14 13 
 )
15 14
16 15 
 func TestServiceRemoveError(t *testing.T) {
client/service_update.go
History View file @ 7d62e40
... ... 
@@ -1,13 +1,13 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"encoding/json"
5 6 
 	"net/url"
6 7 
 	"strconv"
7 8
8 9 
 	"github.com/docker/docker/api/types"
9 10 
 	"github.com/docker/docker/api/types/swarm"
10 
-	"golang.org/x/net/context"
11 11 
 )
12 12
13 13 
 // ServiceUpdate updates a Service.
client/service_update_test.go
History View file @ 7d62e40
... ... 
@@ -2,14 +2,13 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"fmt"
6 7 
 	"io/ioutil"
7 8 
 	"net/http"
8 9 
 	"strings"
9 10 
 	"testing"
10 11
11 
-	"golang.org/x/net/context"
12 
-
13 12 
 	"github.com/docker/docker/api/types"
14 13 
 	"github.com/docker/docker/api/types/swarm"
15 14 
 )
client/session.go
History View file @ 7d62e40
... ... 
@@ -1,10 +1,9 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"net"
5 6 
 	"net/http"
6 
-
7 
-	"golang.org/x/net/context"
8 7 
 )
9 8
10 9 
 // DialSession returns a connection that can be used communication with daemon
client/swarm_get_unlock_key.go
History View file @ 7d62e40
... ... 
@@ -1,10 +1,10 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"encoding/json"
5 6
6 7 
 	"github.com/docker/docker/api/types"
7 
-	"golang.org/x/net/context"
8 8 
 )
9 9
10 10 
 // SwarmGetUnlockKey retrieves the swarm's unlock key.
client/swarm_get_unlock_key_test.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"encoding/json"
6 7 
 	"fmt"
7 8 
 	"io/ioutil"
... ... 
@@ -13,7 +14,6 @@ import (
13 13 
 	"github.com/docker/docker/internal/testutil"
14 14 
 	"github.com/gotestyourself/gotestyourself/assert"
15 15 
 	is "github.com/gotestyourself/gotestyourself/assert/cmp"
16 
-	"golang.org/x/net/context"
17 16 
 )
18 17
19 18 
 func TestSwarmGetUnlockKeyError(t *testing.T) {
client/swarm_init.go
History View file @ 7d62e40
... ... 
@@ -1,10 +1,10 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"encoding/json"
5 6
6 7 
 	"github.com/docker/docker/api/types/swarm"
7 
-	"golang.org/x/net/context"
8 8 
 )
9 9
10 10 
 // SwarmInit initializes the swarm.
client/swarm_init_test.go
History View file @ 7d62e40
... ... 
@@ -2,14 +2,13 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"fmt"
6 7 
 	"io/ioutil"
7 8 
 	"net/http"
8 9 
 	"strings"
9 10 
 	"testing"
10 11
11 
-	"golang.org/x/net/context"
12 
-
13 12 
 	"github.com/docker/docker/api/types/swarm"
14 13 
 )
15 14
client/swarm_inspect.go
History View file @ 7d62e40
... ... 
@@ -1,10 +1,10 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"encoding/json"
5 6
6 7 
 	"github.com/docker/docker/api/types/swarm"
7 
-	"golang.org/x/net/context"
8 8 
 )
9 9
10 10 
 // SwarmInspect inspects the swarm.
client/swarm_inspect_test.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"encoding/json"
6 7 
 	"fmt"
7 8 
 	"io/ioutil"
... ... 
@@ -10,7 +11,6 @@ import (
10 10 
 	"testing"
11 11
12 12 
 	"github.com/docker/docker/api/types/swarm"
13 
-	"golang.org/x/net/context"
14 13 
 )
15 14
16 15 
 func TestSwarmInspectError(t *testing.T) {
client/swarm_join.go
History View file @ 7d62e40
... ... 
@@ -1,8 +1,9 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
5 
+
4 6 
 	"github.com/docker/docker/api/types/swarm"
5 
-	"golang.org/x/net/context"
6 7 
 )
7 8
8 9 
 // SwarmJoin joins the swarm.
client/swarm_join_test.go
History View file @ 7d62e40
... ... 
@@ -2,14 +2,13 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"fmt"
6 7 
 	"io/ioutil"
7 8 
 	"net/http"
8 9 
 	"strings"
9 10 
 	"testing"
10 11
11 
-	"golang.org/x/net/context"
12 
-
13 12 
 	"github.com/docker/docker/api/types/swarm"
14 13 
 )
15 14
client/swarm_leave.go
History View file @ 7d62e40
... ... 
@@ -1,9 +1,8 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"net/url"
5 
-
6 
-	"golang.org/x/net/context"
7 6 
 )
8 7
9 8 
 // SwarmLeave leaves the swarm.
client/swarm_leave_test.go
History View file @ 7d62e40
... ... 
@@ -2,13 +2,12 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"fmt"
6 7 
 	"io/ioutil"
7 8 
 	"net/http"
8 9 
 	"strings"
9 10 
 	"testing"
10 
-
11 
-	"golang.org/x/net/context"
12 11 
 )
13 12
14 13 
 func TestSwarmLeaveError(t *testing.T) {
client/swarm_unlock.go
History View file @ 7d62e40
... ... 
@@ -1,8 +1,9 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
5 
+
4 6 
 	"github.com/docker/docker/api/types/swarm"
5 
-	"golang.org/x/net/context"
6 7 
 )
7 8
8 9 
 // SwarmUnlock unlocks locked swarm.
client/swarm_unlock_test.go
History View file @ 7d62e40
... ... 
@@ -2,14 +2,13 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"fmt"
6 7 
 	"io/ioutil"
7 8 
 	"net/http"
8 9 
 	"strings"
9 10 
 	"testing"
10 11
11 
-	"golang.org/x/net/context"
12 
-
13 12 
 	"github.com/docker/docker/api/types/swarm"
14 13 
 )
15 14
client/swarm_update.go
History View file @ 7d62e40
... ... 
@@ -1,12 +1,12 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"fmt"
5 6 
 	"net/url"
6 7 
 	"strconv"
7 8
8 9 
 	"github.com/docker/docker/api/types/swarm"
9 
-	"golang.org/x/net/context"
10 10 
 )
11 11
12 12 
 // SwarmUpdate updates the swarm.
client/swarm_update_test.go
History View file @ 7d62e40
... ... 
@@ -2,14 +2,13 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"fmt"
6 7 
 	"io/ioutil"
7 8 
 	"net/http"
8 9 
 	"strings"
9 10 
 	"testing"
10 11
11 
-	"golang.org/x/net/context"
12 
-
13 12 
 	"github.com/docker/docker/api/types/swarm"
14 13 
 )
15 14
client/task_inspect.go
History View file @ 7d62e40
... ... 
@@ -2,11 +2,11 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"encoding/json"
6 7 
 	"io/ioutil"
7 8
8 9 
 	"github.com/docker/docker/api/types/swarm"
9 
-	"golang.org/x/net/context"
10 10 
 )
11 11
12 12 
 // TaskInspectWithRaw returns the task information and its raw representation..
client/task_inspect_test.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"encoding/json"
6 7 
 	"fmt"
7 8 
 	"io/ioutil"
... ... 
@@ -11,7 +12,6 @@ import (
11 11
12 12 
 	"github.com/docker/docker/api/types/swarm"
13 13 
 	"github.com/pkg/errors"
14 
-	"golang.org/x/net/context"
15 14 
 )
16 15
17 16 
 func TestTaskInspectError(t *testing.T) {
client/task_list.go
History View file @ 7d62e40
... ... 
@@ -1,13 +1,13 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"encoding/json"
5 6 
 	"net/url"
6 7
7 8 
 	"github.com/docker/docker/api/types"
8 9 
 	"github.com/docker/docker/api/types/filters"
9 10 
 	"github.com/docker/docker/api/types/swarm"
10 
-	"golang.org/x/net/context"
11 11 
 )
12 12
13 13 
 // TaskList returns the list of tasks.
client/task_list_test.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"encoding/json"
6 7 
 	"fmt"
7 8 
 	"io/ioutil"
... ... 
@@ -12,7 +13,6 @@ import (
12 12 
 	"github.com/docker/docker/api/types"
13 13 
 	"github.com/docker/docker/api/types/filters"
14 14 
 	"github.com/docker/docker/api/types/swarm"
15 
-	"golang.org/x/net/context"
16 15 
 )
17 16
18 17 
 func TestTaskListError(t *testing.T) {
client/task_logs.go
History View file @ 7d62e40
... ... 
@@ -1,12 +1,11 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"io"
5 6 
 	"net/url"
6 7 
 	"time"
7 8
8 
-	"golang.org/x/net/context"
9 
-
10 9 
 	"github.com/docker/docker/api/types"
11 10 
 	timetypes "github.com/docker/docker/api/types/time"
12 11 
 )
client/version.go
History View file @ 7d62e40
... ... 
@@ -1,10 +1,10 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"encoding/json"
5 6
6 7 
 	"github.com/docker/docker/api/types"
7 
-	"golang.org/x/net/context"
8 8 
 )
9 9
10 10 
 // ServerVersion returns information of the docker client and server host.
client/volume_create.go
History View file @ 7d62e40
... ... 
@@ -1,11 +1,11 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"encoding/json"
5 6
6 7 
 	"github.com/docker/docker/api/types"
7 8 
 	volumetypes "github.com/docker/docker/api/types/volume"
8 
-	"golang.org/x/net/context"
9 9 
 )
10 10
11 11 
 // VolumeCreate creates a volume in the docker host.
client/volume_create_test.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"encoding/json"
6 7 
 	"fmt"
7 8 
 	"io/ioutil"
... ... 
@@ -11,7 +12,6 @@ import (
11 11
12 12 
 	"github.com/docker/docker/api/types"
13 13 
 	volumetypes "github.com/docker/docker/api/types/volume"
14 
-	"golang.org/x/net/context"
15 14 
 )
16 15
17 16 
 func TestVolumeCreateError(t *testing.T) {
client/volume_inspect.go
History View file @ 7d62e40
... ... 
@@ -2,11 +2,11 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"encoding/json"
6 7 
 	"io/ioutil"
7 8
8 9 
 	"github.com/docker/docker/api/types"
9 
-	"golang.org/x/net/context"
10 10 
 )
11 11
12 12 
 // VolumeInspect returns the information about a specific volume in the docker host.
client/volume_inspect_test.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"encoding/json"
6 7 
 	"fmt"
7 8 
 	"io/ioutil"
... ... 
@@ -14,7 +15,6 @@ import (
14 14 
 	"github.com/gotestyourself/gotestyourself/assert"
15 15 
 	is "github.com/gotestyourself/gotestyourself/assert/cmp"
16 16 
 	"github.com/pkg/errors"
17 
-	"golang.org/x/net/context"
18 17 
 )
19 18
20 19 
 func TestVolumeInspectError(t *testing.T) {
client/volume_list.go
History View file @ 7d62e40
... ... 
@@ -1,12 +1,12 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"encoding/json"
5 6 
 	"net/url"
6 7
7 8 
 	"github.com/docker/docker/api/types/filters"
8 9 
 	volumetypes "github.com/docker/docker/api/types/volume"
9 
-	"golang.org/x/net/context"
10 10 
 )
11 11
12 12 
 // VolumeList returns the volumes configured in the docker host.
client/volume_list_test.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"encoding/json"
6 7 
 	"fmt"
7 8 
 	"io/ioutil"
... ... 
@@ -12,7 +13,6 @@ import (
12 12 
 	"github.com/docker/docker/api/types"
13 13 
 	"github.com/docker/docker/api/types/filters"
14 14 
 	volumetypes "github.com/docker/docker/api/types/volume"
15 
-	"golang.org/x/net/context"
16 15 
 )
17 16
18 17 
 func TestVolumeListError(t *testing.T) {
client/volume_prune.go
History View file @ 7d62e40
... ... 
@@ -1,12 +1,12 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"encoding/json"
5 6 
 	"fmt"
6 7
7 8 
 	"github.com/docker/docker/api/types"
8 9 
 	"github.com/docker/docker/api/types/filters"
9 
-	"golang.org/x/net/context"
10 10 
 )
11 11
12 12 
 // VolumesPrune requests the daemon to delete unused data
client/volume_remove.go
History View file @ 7d62e40
... ... 
@@ -1,10 +1,10 @@
1 1 
 package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"net/url"
5 6
6 7 
 	"github.com/docker/docker/api/types/versions"
7 
-	"golang.org/x/net/context"
8 8 
 )
9 9
10 10 
 // VolumeRemove removes a volume from the docker host.
client/volume_remove_test.go
History View file @ 7d62e40
... ... 
@@ -2,13 +2,12 @@ package client // import "github.com/docker/docker/client"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"fmt"
6 7 
 	"io/ioutil"
7 8 
 	"net/http"
8 9 
 	"strings"
9 10 
 	"testing"
10 
-
11 
-	"golang.org/x/net/context"
12 11 
 )
13 12
14 13 
 func TestVolumeRemoveError(t *testing.T) {
container/container.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package container // import "github.com/docker/docker/container"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"encoding/json"
6 7 
 	"fmt"
7 8 
 	"io"
... ... 
@@ -47,7 +48,6 @@ import (
47 47 
 	agentexec "github.com/docker/swarmkit/agent/exec"
48 48 
 	"github.com/pkg/errors"
49 49 
 	"github.com/sirupsen/logrus"
50 
-	"golang.org/x/net/context"
51 50 
 )
52 51
53 52 
 const configFileName = "config.v2.json"
container/state.go
History View file @ 7d62e40
... ... 
@@ -1,13 +1,12 @@
1 1 
 package container // import "github.com/docker/docker/container"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"errors"
5 6 
 	"fmt"
6 7 
 	"sync"
7 8 
 	"time"
8 9
9 
-	"golang.org/x/net/context"
10 
-
11 10 
 	"github.com/docker/docker/api/types"
12 11 
 	"github.com/docker/go-units"
13 12 
 )
container/stream/attach.go
History View file @ 7d62e40
... ... 
@@ -1,11 +1,10 @@
1 1 
 package stream // import "github.com/docker/docker/container/stream"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"io"
5 6 
 	"sync"
6 7
7 
-	"golang.org/x/net/context"
8 
-
9 8 
 	"github.com/docker/docker/pkg/pools"
10 9 
 	"github.com/docker/docker/pkg/term"
11 10 
 	"github.com/sirupsen/logrus"
daemon/auth.go
History View file @ 7d62e40
... ... 
@@ -1,7 +1,7 @@
1 1 
 package daemon // import "github.com/docker/docker/daemon"
2 2
3 3 
 import (
4 
-	"golang.org/x/net/context"
4 
+	"context"
5 5
6 6 
 	"github.com/docker/docker/api/types"
7 7 
 	"github.com/docker/docker/dockerversion"
daemon/cluster/cluster.go
History View file @ 7d62e40
... ... 
@@ -39,6 +39,7 @@ package cluster // import "github.com/docker/docker/daemon/cluster"
39 39 
 //
40 40
41 41 
 import (
42 
+	"context"
42 43 
 	"fmt"
43 44 
 	"net"
44 45 
 	"os"
... ... 
@@ -56,7 +57,6 @@ import (
56 56 
 	swarmnode "github.com/docker/swarmkit/node"
57 57 
 	"github.com/pkg/errors"
58 58 
 	"github.com/sirupsen/logrus"
59 
-	"golang.org/x/net/context"
60 59 
 )
61 60
62 61 
 const swarmDirName = "swarm"
daemon/cluster/configs.go
History View file @ 7d62e40
... ... 
@@ -1,11 +1,12 @@
1 1 
 package cluster // import "github.com/docker/docker/daemon/cluster"
2 2
3 3 
 import (
4 
+	"context"
5 
+
4 6 
 	apitypes "github.com/docker/docker/api/types"
5 7 
 	types "github.com/docker/docker/api/types/swarm"
6 8 
 	"github.com/docker/docker/daemon/cluster/convert"
7 9 
 	swarmapi "github.com/docker/swarmkit/api"
8 
-	"golang.org/x/net/context"
9 10 
 )
10 11
11 12 
 // GetConfig returns a config from a managed swarm cluster
daemon/cluster/controllers/plugin/controller.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package plugin // import "github.com/docker/docker/daemon/cluster/controllers/plugin"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"io"
5 6 
 	"io/ioutil"
6 7 
 	"net/http"
... ... 
@@ -15,7 +16,6 @@ import (
15 15 
 	"github.com/gogo/protobuf/proto"
16 16 
 	"github.com/pkg/errors"
17 17 
 	"github.com/sirupsen/logrus"
18 
-	"golang.org/x/net/context"
19 18 
 )
20 19
21 20 
 // Controller is the controller for the plugin backend.
daemon/cluster/controllers/plugin/controller_test.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package plugin // import "github.com/docker/docker/daemon/cluster/controllers/plugin"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"errors"
5 6 
 	"io"
6 7 
 	"io/ioutil"
... ... 
@@ -16,7 +17,6 @@ import (
16 16 
 	"github.com/docker/docker/plugin"
17 17 
 	"github.com/docker/docker/plugin/v2"
18 18 
 	"github.com/sirupsen/logrus"
19 
-	"golang.org/x/net/context"
20 19 
 )
21 20
22 21 
 const (
daemon/cluster/executor/backend.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package executor // import "github.com/docker/docker/daemon/cluster/executor"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"io"
5 6 
 	"time"
6 7
... ... 
@@ -21,7 +22,6 @@ import (
21 21 
 	"github.com/docker/libnetwork/cluster"
22 22 
 	networktypes "github.com/docker/libnetwork/types"
23 23 
 	"github.com/docker/swarmkit/agent/exec"
24 
-	"golang.org/x/net/context"
25 24 
 )
26 25
27 26 
 // Backend defines the executor component for a swarm agent.
daemon/cluster/executor/container/adapter.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package container // import "github.com/docker/docker/daemon/cluster/executor/container"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"encoding/base64"
5 6 
 	"encoding/json"
6 7 
 	"errors"
... ... 
@@ -28,7 +29,6 @@ import (
28 28 
 	gogotypes "github.com/gogo/protobuf/types"
29 29 
 	"github.com/opencontainers/go-digest"
30 30 
 	"github.com/sirupsen/logrus"
31 
-	"golang.org/x/net/context"
32 31 
 	"golang.org/x/time/rate"
33 32 
 )
34 33
daemon/cluster/executor/container/attachment.go
History View file @ 7d62e40
... ... 
@@ -1,10 +1,11 @@
1 1 
 package container // import "github.com/docker/docker/daemon/cluster/executor/container"
2 2
3 3 
 import (
4 
+	"context"
5 
+
4 6 
 	executorpkg "github.com/docker/docker/daemon/cluster/executor"
5 7 
 	"github.com/docker/swarmkit/agent/exec"
6 8 
 	"github.com/docker/swarmkit/api"
7 
-	"golang.org/x/net/context"
8 9 
 )
9 10
10 11 
 // networkAttacherController implements agent.Controller against docker's API.
daemon/cluster/executor/container/controller.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package container // import "github.com/docker/docker/daemon/cluster/executor/container"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"fmt"
5 6 
 	"os"
6 7 
 	"strconv"
... ... 
@@ -17,7 +18,6 @@ import (
17 17 
 	"github.com/docker/swarmkit/log"
18 18 
 	gogotypes "github.com/gogo/protobuf/types"
19 19 
 	"github.com/pkg/errors"
20 
-	"golang.org/x/net/context"
21 20 
 	"golang.org/x/time/rate"
22 21 
 )
23 22
daemon/cluster/executor/container/executor.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package container // import "github.com/docker/docker/daemon/cluster/executor/container"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"fmt"
5 6 
 	"sort"
6 7 
 	"strings"
... ... 
@@ -21,7 +22,6 @@ import (
21 21 
 	"github.com/docker/swarmkit/api/naming"
22 22 
 	"github.com/docker/swarmkit/template"
23 23 
 	"github.com/sirupsen/logrus"
24 
-	"golang.org/x/net/context"
25 24 
 )
26 25
27 26 
 type executor struct {
daemon/cluster/executor/container/health_test.go
History View file @ 7d62e40
... ... 
@@ -3,6 +3,7 @@
3 3 
 package container // import "github.com/docker/docker/daemon/cluster/executor/container"
4 4
5 5 
 import (
6 
+	"context"
6 7 
 	"testing"
7 8 
 	"time"
8 9
... ... 
@@ -11,7 +12,6 @@ import (
11 11 
 	"github.com/docker/docker/daemon"
12 12 
 	"github.com/docker/docker/daemon/events"
13 13 
 	"github.com/docker/swarmkit/api"
14 
-	"golang.org/x/net/context"
15 14 
 )
16 15
17 16 
 func TestHealthStates(t *testing.T) {
daemon/cluster/helpers.go
History View file @ 7d62e40
... ... 
@@ -1,12 +1,12 @@
1 1 
 package cluster // import "github.com/docker/docker/daemon/cluster"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"fmt"
5 6
6 7 
 	"github.com/docker/docker/errdefs"
7 8 
 	swarmapi "github.com/docker/swarmkit/api"
8 9 
 	"github.com/pkg/errors"
9 
-	"golang.org/x/net/context"
10 10 
 )
11 11
12 12 
 func getSwarm(ctx context.Context, c swarmapi.ControlClient) (*swarmapi.Cluster, error) {
daemon/cluster/networks.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package cluster // import "github.com/docker/docker/daemon/cluster"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"fmt"
5 6
6 7 
 	apitypes "github.com/docker/docker/api/types"
... ... 
@@ -12,7 +13,6 @@ import (
12 12 
 	swarmapi "github.com/docker/swarmkit/api"
13 13 
 	"github.com/pkg/errors"
14 14 
 	"github.com/sirupsen/logrus"
15 
-	"golang.org/x/net/context"
16 15 
 )
17 16
18 17 
 // GetNetworks returns all current cluster managed networks.
daemon/cluster/noderunner.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package cluster // import "github.com/docker/docker/daemon/cluster"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"fmt"
5 6 
 	"path/filepath"
6 7 
 	"runtime"
... ... 
@@ -15,7 +16,6 @@ import (
15 15 
 	swarmnode "github.com/docker/swarmkit/node"
16 16 
 	"github.com/pkg/errors"
17 17 
 	"github.com/sirupsen/logrus"
18 
-	"golang.org/x/net/context"
19 18 
 	"google.golang.org/grpc"
20 19 
 	"google.golang.org/grpc/codes"
21 20 
 	"google.golang.org/grpc/status"
daemon/cluster/nodes.go
History View file @ 7d62e40
... ... 
@@ -1,12 +1,13 @@
1 1 
 package cluster // import "github.com/docker/docker/daemon/cluster"
2 2
3 3 
 import (
4 
+	"context"
5 
+
4 6 
 	apitypes "github.com/docker/docker/api/types"
5 7 
 	types "github.com/docker/docker/api/types/swarm"
6 8 
 	"github.com/docker/docker/daemon/cluster/convert"
7 9 
 	"github.com/docker/docker/errdefs"
8 10 
 	swarmapi "github.com/docker/swarmkit/api"
9 
-	"golang.org/x/net/context"
10 11 
 )
11 12
12 13 
 // GetNodes returns a list of all nodes known to a cluster.
daemon/cluster/secrets.go
History View file @ 7d62e40
... ... 
@@ -1,11 +1,12 @@
1 1 
 package cluster // import "github.com/docker/docker/daemon/cluster"
2 2
3 3 
 import (
4 
+	"context"
5 
+
4 6 
 	apitypes "github.com/docker/docker/api/types"
5 7 
 	types "github.com/docker/docker/api/types/swarm"
6 8 
 	"github.com/docker/docker/daemon/cluster/convert"
7 9 
 	swarmapi "github.com/docker/swarmkit/api"
8 
-	"golang.org/x/net/context"
9 10 
 )
10 11
11 12 
 // GetSecret returns a secret from a managed swarm cluster
daemon/cluster/services.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package cluster // import "github.com/docker/docker/daemon/cluster"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"encoding/base64"
5 6 
 	"encoding/json"
6 7 
 	"fmt"
... ... 
@@ -22,7 +23,6 @@ import (
22 22 
 	gogotypes "github.com/gogo/protobuf/types"
23 23 
 	"github.com/pkg/errors"
24 24 
 	"github.com/sirupsen/logrus"
25 
-	"golang.org/x/net/context"
26 25 
 )
27 26
28 27 
 // GetServices returns all services of a managed swarm cluster.
daemon/cluster/swarm.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package cluster // import "github.com/docker/docker/daemon/cluster"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"fmt"
5 6 
 	"net"
6 7 
 	"strings"
... ... 
@@ -18,7 +19,6 @@ import (
18 18 
 	swarmnode "github.com/docker/swarmkit/node"
19 19 
 	"github.com/pkg/errors"
20 20 
 	"github.com/sirupsen/logrus"
21 
-	"golang.org/x/net/context"
22 21 
 )
23 22
24 23 
 // Init initializes new cluster from user provided request.
daemon/cluster/tasks.go
History View file @ 7d62e40
... ... 
@@ -1,12 +1,13 @@
1 1 
 package cluster // import "github.com/docker/docker/daemon/cluster"
2 2
3 3 
 import (
4 
+	"context"
5 
+
4 6 
 	apitypes "github.com/docker/docker/api/types"
5 7 
 	"github.com/docker/docker/api/types/filters"
6 8 
 	types "github.com/docker/docker/api/types/swarm"
7 9 
 	"github.com/docker/docker/daemon/cluster/convert"
8 10 
 	swarmapi "github.com/docker/swarmkit/api"
9 
-	"golang.org/x/net/context"
10 11 
 )
11 12
12 13 
 // GetTasks returns a list of tasks matching the filter options.
daemon/disk_usage.go
History View file @ 7d62e40
... ... 
@@ -1,11 +1,10 @@
1 1 
 package daemon // import "github.com/docker/docker/daemon"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"fmt"
5 6 
 	"sync/atomic"
6 7
7 
-	"golang.org/x/net/context"
8 
-
9 8 
 	"github.com/docker/docker/api/types"
10 9 
 	"github.com/docker/docker/api/types/filters"
11 10 
 	"github.com/docker/docker/pkg/directory"
daemon/exec.go
History View file @ 7d62e40
... ... 
@@ -1,13 +1,12 @@
1 1 
 package daemon // import "github.com/docker/docker/daemon"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"fmt"
5 6 
 	"io"
6 7 
 	"strings"
7 8 
 	"time"
8 9
9 
-	"golang.org/x/net/context"
10 
-
11 10 
 	"github.com/docker/docker/api/types"
12 11 
 	"github.com/docker/docker/api/types/strslice"
13 12 
 	"github.com/docker/docker/container"
daemon/health.go
History View file @ 7d62e40
... ... 
@@ -2,14 +2,13 @@ package daemon // import "github.com/docker/docker/daemon"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"fmt"
6 7 
 	"runtime"
7 8 
 	"strings"
8 9 
 	"sync"
9 10 
 	"time"
10 11
11 
-	"golang.org/x/net/context"
12 
-
13 12 
 	"github.com/docker/docker/api/types"
14 13 
 	containertypes "github.com/docker/docker/api/types/container"
15 14 
 	"github.com/docker/docker/api/types/strslice"
daemon/images/image_builder.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package images // import "github.com/docker/docker/daemon/images"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"io"
5 6
6 7 
 	"github.com/docker/distribution/reference"
... ... 
@@ -14,7 +15,6 @@ import (
14 14 
 	"github.com/docker/docker/pkg/system"
15 15 
 	"github.com/docker/docker/registry"
16 16 
 	"github.com/pkg/errors"
17 
-	"golang.org/x/net/context"
18 17 
 )
19 18
20 19 
 type roLayer struct {
daemon/images/image_prune.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package images // import "github.com/docker/docker/daemon/images"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"fmt"
5 6 
 	"sync/atomic"
6 7 
 	"time"
... ... 
@@ -14,7 +15,6 @@ import (
14 14 
 	"github.com/docker/docker/layer"
15 15 
 	digest "github.com/opencontainers/go-digest"
16 16 
 	"github.com/sirupsen/logrus"
17 
-	"golang.org/x/net/context"
18 17 
 )
19 18
20 19 
 var imagesAcceptedFilters = map[string]bool{
daemon/images/image_pull.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package images // import "github.com/docker/docker/daemon/images"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"io"
5 6 
 	"runtime"
6 7 
 	"strings"
... ... 
@@ -14,7 +15,6 @@ import (
14 14 
 	"github.com/docker/docker/pkg/progress"
15 15 
 	"github.com/docker/docker/registry"
16 16 
 	"github.com/opencontainers/go-digest"
17 
-	"golang.org/x/net/context"
18 17 
 )
19 18
20 19 
 // PullImage initiates a pull operation. image is the repository name to pull, and
daemon/images/image_push.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package images // import "github.com/docker/docker/daemon/images"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"io"
5 6
6 7 
 	"github.com/docker/distribution/manifest/schema2"
... ... 
@@ -9,7 +10,6 @@ import (
9 9 
 	"github.com/docker/docker/distribution"
10 10 
 	progressutils "github.com/docker/docker/distribution/utils"
11 11 
 	"github.com/docker/docker/pkg/progress"
12 
-	"golang.org/x/net/context"
13 12 
 )
14 13
15 14 
 // PushImage initiates a push operation on the repository named localName.
daemon/images/image_search.go
History View file @ 7d62e40
... ... 
@@ -1,10 +1,9 @@
1 1 
 package images // import "github.com/docker/docker/daemon/images"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"strconv"
5 6
6 
-	"golang.org/x/net/context"
7 
-
8 7 
 	"github.com/docker/docker/api/types"
9 8 
 	"github.com/docker/docker/api/types/filters"
10 9 
 	registrytypes "github.com/docker/docker/api/types/registry"
daemon/images/image_search_test.go
History View file @ 7d62e40
... ... 
@@ -1,12 +1,11 @@
1 1 
 package images // import "github.com/docker/docker/daemon/images"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"errors"
5 6 
 	"strings"
6 7 
 	"testing"
7 8
8 
-	"golang.org/x/net/context"
9 
-
10 9 
 	"github.com/docker/docker/api/types"
11 10 
 	registrytypes "github.com/docker/docker/api/types/registry"
12 11 
 	"github.com/docker/docker/registry"
daemon/logger/gcplogs/gcplogging.go
History View file @ 7d62e40
... ... 
@@ -6,12 +6,13 @@ import (
6 6 
 	"sync/atomic"
7 7 
 	"time"
8 8
9 
+	"context"
10 
+
9 11 
 	"github.com/docker/docker/daemon/logger"
10 12
11 13 
 	"cloud.google.com/go/compute/metadata"
12 14 
 	"cloud.google.com/go/logging"
13 15 
 	"github.com/sirupsen/logrus"
14 
-	"golang.org/x/net/context"
15 16 
 	mrpb "google.golang.org/genproto/googleapis/api/monitoredres"
16 17 
 )
17 18
daemon/logs.go
History View file @ 7d62e40
... ... 
@@ -1,11 +1,10 @@
1 1 
 package daemon // import "github.com/docker/docker/daemon"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"strconv"
5 6 
 	"time"
6 7
7 
-	"golang.org/x/net/context"
8 
-
9 8 
 	"github.com/docker/docker/api/types"
10 9 
 	"github.com/docker/docker/api/types/backend"
11 10 
 	containertypes "github.com/docker/docker/api/types/container"
daemon/network.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package daemon // import "github.com/docker/docker/daemon"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"fmt"
5 6 
 	"net"
6 7 
 	"runtime"
... ... 
@@ -21,7 +22,6 @@ import (
21 21 
 	networktypes "github.com/docker/libnetwork/types"
22 22 
 	"github.com/pkg/errors"
23 23 
 	"github.com/sirupsen/logrus"
24 
-	"golang.org/x/net/context"
25 24 
 )
26 25
27 26 
 // PredefinedNetworkError is returned when user tries to create predefined network that already exists.
daemon/prune.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package daemon // import "github.com/docker/docker/daemon"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"fmt"
5 6 
 	"regexp"
6 7 
 	"sync/atomic"
... ... 
@@ -14,7 +15,6 @@ import (
14 14 
 	"github.com/docker/docker/volume"
15 15 
 	"github.com/docker/libnetwork"
16 16 
 	"github.com/sirupsen/logrus"
17 
-	"golang.org/x/net/context"
18 17 
 )
19 18
20 19 
 var (
daemon/stats.go
History View file @ 7d62e40
... ... 
@@ -1,13 +1,12 @@
1 1 
 package daemon // import "github.com/docker/docker/daemon"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"encoding/json"
5 6 
 	"errors"
6 7 
 	"runtime"
7 8 
 	"time"
8 9
9 
-	"golang.org/x/net/context"
10 
-
11 10 
 	"github.com/docker/docker/api/types"
12 11 
 	"github.com/docker/docker/api/types/backend"
13 12 
 	"github.com/docker/docker/api/types/versions"
daemon/wait.go
History View file @ 7d62e40
... ... 
@@ -1,8 +1,9 @@
1 1 
 package daemon // import "github.com/docker/docker/daemon"
2 2
3 3 
 import (
4 
+	"context"
5 
+
4 6 
 	"github.com/docker/docker/container"
5 
-	"golang.org/x/net/context"
6 7 
 )
7 8
8 9 
 // ContainerWait waits until the given container is in a certain state
distribution/config.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package distribution // import "github.com/docker/docker/distribution"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"encoding/json"
5 6 
 	"fmt"
6 7 
 	"io"
... ... 
@@ -20,7 +21,6 @@ import (
20 20 
 	"github.com/docker/libtrust"
21 21 
 	"github.com/opencontainers/go-digest"
22 22 
 	specs "github.com/opencontainers/image-spec/specs-go/v1"
23 
-	"golang.org/x/net/context"
24 23 
 )
25 24
26 25 
 // Config stores configuration for communicating
distribution/pull.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package distribution // import "github.com/docker/docker/distribution"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"fmt"
5 6 
 	"runtime"
6 7
... ... 
@@ -13,7 +14,6 @@ import (
13 13 
 	"github.com/opencontainers/go-digest"
14 14 
 	"github.com/pkg/errors"
15 15 
 	"github.com/sirupsen/logrus"
16 
-	"golang.org/x/net/context"
17 16 
 )
18 17
19 18 
 // Puller is an interface that abstracts pulling for different API versions.
distribution/pull_v1.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package distribution // import "github.com/docker/docker/distribution"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"errors"
5 6 
 	"fmt"
6 7 
 	"io"
... ... 
@@ -25,7 +26,6 @@ import (
25 25 
 	"github.com/docker/docker/pkg/stringid"
26 26 
 	"github.com/docker/docker/registry"
27 27 
 	"github.com/sirupsen/logrus"
28 
-	"golang.org/x/net/context"
29 28 
 )
30 29
31 30 
 type v1Puller struct {
distribution/pull_v2.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package distribution // import "github.com/docker/docker/distribution"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"encoding/json"
5 6 
 	"fmt"
6 7 
 	"io"
... ... 
@@ -33,7 +34,6 @@ import (
33 33 
 	specs "github.com/opencontainers/image-spec/specs-go/v1"
34 34 
 	"github.com/pkg/errors"
35 35 
 	"github.com/sirupsen/logrus"
36 
-	"golang.org/x/net/context"
37 36 
 )
38 37
39 38 
 var (
distribution/push.go
History View file @ 7d62e40
... ... 
@@ -3,6 +3,7 @@ package distribution // import "github.com/docker/docker/distribution"
3 3 
 import (
4 4 
 	"bufio"
5 5 
 	"compress/gzip"
6 
+	"context"
6 7 
 	"fmt"
7 8 
 	"io"
8 9
... ... 
@@ -11,7 +12,6 @@ import (
11 11 
 	"github.com/docker/docker/pkg/progress"
12 12 
 	"github.com/docker/docker/registry"
13 13 
 	"github.com/sirupsen/logrus"
14 
-	"golang.org/x/net/context"
15 14 
 )
16 15
17 16 
 // Pusher is an interface that abstracts pushing for different API versions.
distribution/push_v1.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package distribution // import "github.com/docker/docker/distribution"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"fmt"
5 6 
 	"sync"
6 7
... ... 
@@ -18,7 +19,6 @@ import (
18 18 
 	"github.com/docker/docker/registry"
19 19 
 	"github.com/opencontainers/go-digest"
20 20 
 	"github.com/sirupsen/logrus"
21 
-	"golang.org/x/net/context"
22 21 
 )
23 22
24 23 
 type v1Pusher struct {
distribution/push_v2.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package distribution // import "github.com/docker/docker/distribution"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"errors"
5 6 
 	"fmt"
6 7 
 	"io"
... ... 
@@ -9,8 +10,6 @@ import (
9 9 
 	"strings"
10 10 
 	"sync"
11 11
12 
-	"golang.org/x/net/context"
13 
-
14 12 
 	"github.com/docker/distribution"
15 13 
 	"github.com/docker/distribution/manifest/schema1"
16 14 
 	"github.com/docker/distribution/manifest/schema2"
distribution/registry.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package distribution // import "github.com/docker/docker/distribution"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"fmt"
5 6 
 	"net"
6 7 
 	"net/http"
... ... 
@@ -16,7 +17,6 @@ import (
16 16 
 	"github.com/docker/docker/dockerversion"
17 17 
 	"github.com/docker/docker/registry"
18 18 
 	"github.com/docker/go-connections/sockets"
19 
-	"golang.org/x/net/context"
20 19 
 )
21 20
22 21 
 // ImageTypes represents the schema2 config types for images
distribution/registry_unit_test.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package distribution // import "github.com/docker/docker/distribution"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"net/http"
5 6 
 	"net/http/httptest"
6 7 
 	"net/url"
... ... 
@@ -13,7 +14,6 @@ import (
13 13 
 	registrytypes "github.com/docker/docker/api/types/registry"
14 14 
 	"github.com/docker/docker/registry"
15 15 
 	"github.com/sirupsen/logrus"
16 
-	"golang.org/x/net/context"
17 16 
 )
18 17
19 18 
 const secretRegistryToken = "mysecrettoken"
distribution/xfer/download.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package xfer // import "github.com/docker/docker/distribution/xfer"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"errors"
5 6 
 	"fmt"
6 7 
 	"io"
... ... 
@@ -15,7 +16,6 @@ import (
15 15 
 	"github.com/docker/docker/pkg/progress"
16 16 
 	"github.com/docker/docker/pkg/system"
17 17 
 	"github.com/sirupsen/logrus"
18 
-	"golang.org/x/net/context"
19 18 
 )
20 19
21 20 
 const maxDownloadAttempts = 5
distribution/xfer/download_test.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package xfer // import "github.com/docker/docker/distribution/xfer"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"errors"
6 7 
 	"fmt"
7 8 
 	"io"
... ... 
@@ -16,7 +17,6 @@ import (
16 16 
 	"github.com/docker/docker/layer"
17 17 
 	"github.com/docker/docker/pkg/progress"
18 18 
 	"github.com/opencontainers/go-digest"
19 
-	"golang.org/x/net/context"
20 19 
 )
21 20
22 21 
 const maxDownloadConcurrency = 3
distribution/xfer/transfer.go
History View file @ 7d62e40
... ... 
@@ -1,11 +1,11 @@
1 1 
 package xfer // import "github.com/docker/docker/distribution/xfer"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"runtime"
5 6 
 	"sync"
6 7
7 8 
 	"github.com/docker/docker/pkg/progress"
8 
-	"golang.org/x/net/context"
9 9 
 )
10 10
11 11 
 // DoNotRetry is an error wrapper indicating that the error cannot be resolved
distribution/xfer/upload.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package xfer // import "github.com/docker/docker/distribution/xfer"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"errors"
5 6 
 	"time"
6 7
... ... 
@@ -8,7 +9,6 @@ import (
8 8 
 	"github.com/docker/docker/layer"
9 9 
 	"github.com/docker/docker/pkg/progress"
10 10 
 	"github.com/sirupsen/logrus"
11 
-	"golang.org/x/net/context"
12 11 
 )
13 12
14 13 
 const maxUploadAttempts = 5
distribution/xfer/upload_test.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package xfer // import "github.com/docker/docker/distribution/xfer"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"errors"
5 6 
 	"sync/atomic"
6 7 
 	"testing"
... ... 
@@ -9,7 +10,6 @@ import (
9 9 
 	"github.com/docker/distribution"
10 10 
 	"github.com/docker/docker/layer"
11 11 
 	"github.com/docker/docker/pkg/progress"
12 
-	"golang.org/x/net/context"
13 12 
 )
14 13
15 14 
 const maxUploadConcurrency = 3
dockerversion/useragent.go
History View file @ 7d62e40
... ... 
@@ -1,12 +1,12 @@
1 1 
 package dockerversion // import "github.com/docker/docker/dockerversion"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"fmt"
5 6 
 	"runtime"
6 7
7 8 
 	"github.com/docker/docker/pkg/parsers/kernel"
8 9 
 	"github.com/docker/docker/pkg/useragent"
9 
-	"golang.org/x/net/context"
10 10 
 )
11 11
12 12 
 // UAStringKey is used as key type for user-agent string in net/context struct
integration-cli/check_test.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package main
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"fmt"
5 6 
 	"io/ioutil"
6 7 
 	"net/http/httptest"
... ... 
@@ -24,7 +25,6 @@ import (
24 24 
 	"github.com/docker/docker/internal/test/registry"
25 25 
 	"github.com/docker/docker/pkg/reexec"
26 26 
 	"github.com/go-check/check"
27 
-	"golang.org/x/net/context"
28 27 
 )
29 28
30 29 
 const (
integration-cli/daemon/daemon_swarm.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package daemon // import "github.com/docker/docker/integration-cli/daemon"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"fmt"
5 6 
 	"strings"
6 7
... ... 
@@ -11,7 +12,6 @@ import (
11 11 
 	"github.com/docker/docker/integration-cli/checker"
12 12 
 	"github.com/go-check/check"
13 13 
 	"github.com/gotestyourself/gotestyourself/assert"
14 
-	"golang.org/x/net/context"
15 14 
 )
16 15
17 16 
 // CheckServiceTasksInState returns the number of tasks with a matching state,
integration-cli/docker_api_build_test.go
History View file @ 7d62e40
... ... 
@@ -3,6 +3,7 @@ package main
3 3 
 import (
4 4 
 	"archive/tar"
5 5 
 	"bytes"
6 
+	"context"
6 7 
 	"encoding/json"
7 8 
 	"fmt"
8 9 
 	"io"
... ... 
@@ -20,7 +21,6 @@ import (
20 20 
 	"github.com/go-check/check"
21 21 
 	"github.com/gotestyourself/gotestyourself/assert"
22 22 
 	is "github.com/gotestyourself/gotestyourself/assert/cmp"
23 
-	"golang.org/x/net/context"
24 23 
 )
25 24
26 25 
 func (s *DockerSuite) TestBuildAPIDockerFileRemote(c *check.C) {
integration-cli/docker_api_containers_test.go
History View file @ 7d62e40
... ... 
@@ -3,6 +3,7 @@ package main
3 3 
 import (
4 4 
 	"archive/tar"
5 5 
 	"bytes"
6 
+	"context"
6 7 
 	"encoding/json"
7 8 
 	"fmt"
8 9 
 	"io"
... ... 
@@ -34,7 +35,6 @@ import (
34 34 
 	"github.com/gotestyourself/gotestyourself/assert"
35 35 
 	is "github.com/gotestyourself/gotestyourself/assert/cmp"
36 36 
 	"github.com/gotestyourself/gotestyourself/poll"
37 
-	"golang.org/x/net/context"
38 37 
 )
39 38
40 39 
 func (s *DockerSuite) TestContainerAPIGetAll(c *check.C) {
integration-cli/docker_api_containers_windows_test.go
History View file @ 7d62e40
... ... 
@@ -3,6 +3,7 @@
3 3 
 package main
4 4
5 5 
 import (
6 
+	"context"
6 7 
 	"fmt"
7 8 
 	"io/ioutil"
8 9 
 	"math/rand"
... ... 
@@ -15,7 +16,6 @@ import (
15 15 
 	"github.com/go-check/check"
16 16 
 	"github.com/gotestyourself/gotestyourself/assert"
17 17 
 	is "github.com/gotestyourself/gotestyourself/assert/cmp"
18 
-	"golang.org/x/net/context"
19 18 
 )
20 19
21 20 
 func (s *DockerSuite) TestContainersAPICreateMountsBindNamedPipe(c *check.C) {
integration-cli/docker_api_exec_test.go
History View file @ 7d62e40
... ... 
@@ -4,6 +4,7 @@ package main
4 4
5 5 
 import (
6 6 
 	"bytes"
7 
+	"context"
7 8 
 	"encoding/json"
8 9 
 	"fmt"
9 10 
 	"io/ioutil"
... ... 
@@ -17,7 +18,6 @@ import (
17 17 
 	"github.com/docker/docker/integration-cli/checker"
18 18 
 	"github.com/docker/docker/internal/test/request"
19 19 
 	"github.com/go-check/check"
20 
-	"golang.org/x/net/context"
21 20 
 )
22 21
23 22 
 // Regression test for #9414
integration-cli/docker_api_images_test.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package main
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"net/http"
5 6 
 	"net/http/httptest"
6 7 
 	"strings"
... ... 
@@ -13,7 +14,6 @@ import (
13 13 
 	"github.com/docker/docker/integration-cli/cli/build"
14 14 
 	"github.com/docker/docker/internal/test/request"
15 15 
 	"github.com/go-check/check"
16 
-	"golang.org/x/net/context"
17 16 
 )
18 17
19 18 
 func (s *DockerSuite) TestAPIImagesFilter(c *check.C) {
integration-cli/docker_api_inspect_test.go
History View file @ 7d62e40
... ... 
@@ -1,11 +1,10 @@
1 1 
 package main
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"encoding/json"
5 6 
 	"strings"
6 7
7 
-	"golang.org/x/net/context"
8 
-
9 8 
 	"github.com/docker/docker/api/types"
10 9 
 	"github.com/docker/docker/api/types/versions/v1p20"
11 10 
 	"github.com/docker/docker/client"
integration-cli/docker_api_ipcmode_test.go
History View file @ 7d62e40
... ... 
@@ -3,6 +3,7 @@ package main
3 3
4 4 
 import (
5 5 
 	"bufio"
6 
+	"context"
6 7 
 	"fmt"
7 8 
 	"io/ioutil"
8 9 
 	"os"
... ... 
@@ -13,7 +14,6 @@ import (
13 13 
 	"github.com/docker/docker/integration-cli/checker"
14 14 
 	"github.com/docker/docker/integration-cli/cli"
15 15 
 	"github.com/go-check/check"
16 
-	"golang.org/x/net/context"
17 16 
 )
18 17
19 18 
 /* testIpcCheckDevExists checks whether a given mount (identified by its
integration-cli/docker_api_logs_test.go
History View file @ 7d62e40
... ... 
@@ -3,6 +3,7 @@ package main
3 3 
 import (
4 4 
 	"bufio"
5 5 
 	"bytes"
6 
+	"context"
6 7 
 	"fmt"
7 8 
 	"io"
8 9 
 	"io/ioutil"
... ... 
@@ -17,7 +18,6 @@ import (
17 17 
 	"github.com/docker/docker/internal/test/request"
18 18 
 	"github.com/docker/docker/pkg/stdcopy"
19 19 
 	"github.com/go-check/check"
20 
-	"golang.org/x/net/context"
21 20 
 )
22 21
23 22 
 func (s *DockerSuite) TestLogsAPIWithStdout(c *check.C) {
integration-cli/docker_api_stats_test.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package main
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"encoding/json"
5 6 
 	"fmt"
6 7 
 	"net/http"
... ... 
@@ -17,7 +18,6 @@ import (
17 17 
 	"github.com/docker/docker/integration-cli/checker"
18 18 
 	"github.com/docker/docker/internal/test/request"
19 19 
 	"github.com/go-check/check"
20 
-	"golang.org/x/net/context"
21 20 
 )
22 21
23 22 
 var expectedNetworkInterfaceStats = strings.Split("rx_bytes rx_dropped rx_errors rx_packets tx_bytes tx_dropped tx_errors tx_packets", " ")
integration-cli/docker_api_swarm_service_test.go
History View file @ 7d62e40
... ... 
@@ -3,6 +3,7 @@
3 3 
 package main
4 4
5 5 
 import (
6 
+	"context"
6 7 
 	"fmt"
7 8 
 	"strconv"
8 9 
 	"strings"
... ... 
@@ -17,7 +18,6 @@ import (
17 17 
 	testdaemon "github.com/docker/docker/internal/test/daemon"
18 18 
 	"github.com/go-check/check"
19 19 
 	"github.com/gotestyourself/gotestyourself/icmd"
20 
-	"golang.org/x/net/context"
21 20 
 	"golang.org/x/sys/unix"
22 21 
 )
23 22
integration-cli/docker_api_swarm_test.go
History View file @ 7d62e40
... ... 
@@ -3,6 +3,7 @@
3 3 
 package main
4 4
5 5 
 import (
6 
+	"context"
6 7 
 	"fmt"
7 8 
 	"io/ioutil"
8 9 
 	"net"
... ... 
@@ -27,7 +28,6 @@ import (
27 27 
 	"github.com/go-check/check"
28 28 
 	"github.com/gotestyourself/gotestyourself/assert"
29 29 
 	is "github.com/gotestyourself/gotestyourself/assert/cmp"
30 
-	"golang.org/x/net/context"
31 30 
 )
32 31
33 32 
 var defaultReconciliationTimeout = 30 * time.Second
integration-cli/docker_cli_events_test.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package main
2 2
3 3 
 import (
4 4 
 	"bufio"
5 
+	"context"
5 6 
 	"encoding/json"
6 7 
 	"fmt"
7 8 
 	"io"
... ... 
@@ -20,7 +21,6 @@ import (
20 20 
 	"github.com/docker/docker/integration-cli/cli/build"
21 21 
 	"github.com/go-check/check"
22 22 
 	"github.com/gotestyourself/gotestyourself/icmd"
23 
-	"golang.org/x/net/context"
24 23 
 )
25 24
26 25 
 func (s *DockerSuite) TestEventsTimestampFormats(c *check.C) {
integration-cli/docker_cli_exec_test.go
History View file @ 7d62e40
... ... 
@@ -4,6 +4,7 @@ package main
4 4
5 5 
 import (
6 6 
 	"bufio"
7 
+	"context"
7 8 
 	"fmt"
8 9 
 	"os"
9 10 
 	"os/exec"
... ... 
@@ -20,7 +21,6 @@ import (
20 20 
 	"github.com/docker/docker/integration-cli/cli/build"
21 21 
 	"github.com/go-check/check"
22 22 
 	"github.com/gotestyourself/gotestyourself/icmd"
23 
-	"golang.org/x/net/context"
24 23 
 )
25 24
26 25 
 func (s *DockerSuite) TestExec(c *check.C) {
integration-cli/docker_cli_plugins_logdriver_test.go
History View file @ 7d62e40
... ... 
@@ -1,12 +1,12 @@
1 1 
 package main
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"strings"
5 6
6 7 
 	"github.com/docker/docker/client"
7 8 
 	"github.com/docker/docker/integration-cli/checker"
8 9 
 	"github.com/go-check/check"
9 
-	"golang.org/x/net/context"
10 10 
 )
11 11
12 12 
 func (s *DockerSuite) TestPluginLogDriver(c *check.C) {
integration-cli/docker_cli_plugins_test.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package main
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"fmt"
5 6 
 	"io/ioutil"
6 7 
 	"net/http"
... ... 
@@ -16,7 +17,6 @@ import (
16 16 
 	"github.com/docker/docker/integration-cli/daemon"
17 17 
 	"github.com/docker/docker/internal/test/fixtures/plugin"
18 18 
 	"github.com/go-check/check"
19 
-	"golang.org/x/net/context"
20 19 
 )
21 20
22 21 
 var (
integration-cli/docker_cli_run_test.go
History View file @ 7d62e40
... ... 
@@ -3,6 +3,7 @@ package main
3 3 
 import (
4 4 
 	"bufio"
5 5 
 	"bytes"
6 
+	"context"
6 7 
 	"encoding/json"
7 8 
 	"fmt"
8 9 
 	"io"
... ... 
@@ -36,7 +37,6 @@ import (
36 36 
 	"github.com/docker/libnetwork/types"
37 37 
 	"github.com/go-check/check"
38 38 
 	"github.com/gotestyourself/gotestyourself/icmd"
39 
-	"golang.org/x/net/context"
40 39 
 )
41 40
42 41 
 // "test123" should be printed by docker run
integration-cli/docker_cli_swarm_test.go
History View file @ 7d62e40
... ... 
@@ -4,6 +4,7 @@ package main
4 4
5 5 
 import (
6 6 
 	"bytes"
7 
+	"context"
7 8 
 	"encoding/json"
8 9 
 	"encoding/pem"
9 10 
 	"fmt"
... ... 
@@ -29,7 +30,6 @@ import (
29 29 
 	"github.com/gotestyourself/gotestyourself/fs"
30 30 
 	"github.com/gotestyourself/gotestyourself/icmd"
31 31 
 	"github.com/vishvananda/netlink"
32 
-	"golang.org/x/net/context"
33 32 
 )
34 33
35 34 
 func (s *DockerSwarmSuite) TestSwarmUpdate(c *check.C) {
integration-cli/docker_cli_volume_test.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package main
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"fmt"
5 6 
 	"io/ioutil"
6 7 
 	"os"
... ... 
@@ -16,7 +17,6 @@ import (
16 16 
 	"github.com/docker/docker/integration-cli/cli/build"
17 17 
 	"github.com/go-check/check"
18 18 
 	"github.com/gotestyourself/gotestyourself/icmd"
19 
-	"golang.org/x/net/context"
20 19 
 )
21 20
22 21 
 func (s *DockerSuite) TestVolumeCLICreate(c *check.C) {
integration-cli/docker_utils_test.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package main
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"encoding/json"
5 6 
 	"errors"
6 7 
 	"fmt"
... ... 
@@ -21,7 +22,6 @@ import (
21 21 
 	"github.com/docker/docker/internal/test/request"
22 22 
 	"github.com/go-check/check"
23 23 
 	"github.com/gotestyourself/gotestyourself/icmd"
24 
-	"golang.org/x/net/context"
25 24 
 )
26 25
27 26 
 // Deprecated
integration/config/config_test.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package config // import "github.com/docker/docker/integration/config"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"encoding/json"
6 7 
 	"sort"
7 8 
 	"testing"
... ... 
@@ -17,7 +18,6 @@ import (
17 17 
 	"github.com/gotestyourself/gotestyourself/assert"
18 18 
 	is "github.com/gotestyourself/gotestyourself/assert/cmp"
19 19 
 	"github.com/gotestyourself/gotestyourself/skip"
20 
-	"golang.org/x/net/context"
21 20 
 )
22 21
23 22 
 func TestConfigList(t *testing.T) {
integration/internal/container/exec.go
History View file @ 7d62e40
... ... 
@@ -2,11 +2,11 @@ package container
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6
6 7 
 	"github.com/docker/docker/api/types"
7 8 
 	"github.com/docker/docker/client"
8 9 
 	"github.com/docker/docker/pkg/stdcopy"
9 
-	"golang.org/x/net/context"
10 10 
 )
11 11
12 12 
 // ExecResult represents a result returned from Exec()
integration/internal/container/states.go
History View file @ 7d62e40
... ... 
@@ -1,11 +1,11 @@
1 1 
 package container
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"strings"
5 6
6 7 
 	"github.com/docker/docker/client"
7 8 
 	"github.com/gotestyourself/gotestyourself/poll"
8 
-	"golang.org/x/net/context"
9 9 
 )
10 10
11 11 
 // IsStopped verifies the container is in stopped state.
integration/network/inspect_test.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package network // import "github.com/docker/docker/integration/network"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"testing"
5 6 
 	"time"
6 7
... ... 
@@ -11,7 +12,6 @@ import (
11 11 
 	"github.com/docker/docker/integration/internal/swarm"
12 12 
 	"github.com/gotestyourself/gotestyourself/assert"
13 13 
 	"github.com/gotestyourself/gotestyourself/poll"
14 
-	"golang.org/x/net/context"
15 14 
 )
16 15
17 16 
 const defaultSwarmPort = 2477
integration/network/ipvlan/ipvlan_test.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package ipvlan
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"strings"
5 6 
 	"testing"
6 7 
 	"time"
... ... 
@@ -13,7 +14,6 @@ import (
13 13 
 	"github.com/docker/docker/internal/test/daemon"
14 14 
 	"github.com/gotestyourself/gotestyourself/assert"
15 15 
 	"github.com/gotestyourself/gotestyourself/skip"
16 
-	"golang.org/x/net/context"
17 16 
 )
18 17
19 18 
 func TestDockerNetworkIpvlanPersistance(t *testing.T) {
integration/network/service_test.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package network // import "github.com/docker/docker/integration/network"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"testing"
5 6 
 	"time"
6 7
... ... 
@@ -10,7 +11,6 @@ import (
10 10 
 	"github.com/docker/docker/integration/internal/swarm"
11 11 
 	"github.com/gotestyourself/gotestyourself/assert"
12 12 
 	"github.com/gotestyourself/gotestyourself/poll"
13 
-	"golang.org/x/net/context"
14 13 
 )
15 14
16 15 
 func TestServiceWithPredefinedNetwork(t *testing.T) {
integration/secret/secret_test.go
History View file @ 7d62e40
... ... 
@@ -2,6 +2,7 @@ package secret // import "github.com/docker/docker/integration/secret"
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"context"
5 6 
 	"sort"
6 7 
 	"testing"
7 8 
 	"time"
... ... 
@@ -16,7 +17,6 @@ import (
16 16 
 	"github.com/gotestyourself/gotestyourself/assert"
17 17 
 	is "github.com/gotestyourself/gotestyourself/assert/cmp"
18 18 
 	"github.com/gotestyourself/gotestyourself/skip"
19 
-	"golang.org/x/net/context"
20 19 
 )
21 20
22 21 
 func TestSecretInspect(t *testing.T) {
integration/service/create_test.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package service // import "github.com/docker/docker/integration/service"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"io/ioutil"
5 6 
 	"testing"
6 7 
 	"time"
... ... 
@@ -13,7 +14,6 @@ import (
13 13 
 	"github.com/gotestyourself/gotestyourself/assert"
14 14 
 	is "github.com/gotestyourself/gotestyourself/assert/cmp"
15 15 
 	"github.com/gotestyourself/gotestyourself/poll"
16 
-	"golang.org/x/net/context"
17 16 
 )
18 17
19 18 
 func TestCreateServiceMultipleTimes(t *testing.T) {
integration/service/inspect_test.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package service // import "github.com/docker/docker/integration/service"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"testing"
5 6 
 	"time"
6 7
... ... 
@@ -15,7 +16,6 @@ import (
15 15 
 	is "github.com/gotestyourself/gotestyourself/assert/cmp"
16 16 
 	"github.com/gotestyourself/gotestyourself/poll"
17 17 
 	"github.com/gotestyourself/gotestyourself/skip"
18 
-	"golang.org/x/net/context"
19 18 
 )
20 19
21 20 
 func TestInspect(t *testing.T) {
integration/system/info_linux_test.go
History View file @ 7d62e40
... ... 
@@ -3,6 +3,7 @@
3 3 
 package system // import "github.com/docker/docker/integration/system"
4 4
5 5 
 import (
6 
+	"context"
6 7 
 	"net/http"
7 8 
 	"testing"
8 9
... ... 
@@ -10,7 +11,6 @@ import (
10 10 
 	req "github.com/docker/docker/internal/test/request"
11 11 
 	"github.com/gotestyourself/gotestyourself/assert"
12 12 
 	is "github.com/gotestyourself/gotestyourself/assert/cmp"
13 
-	"golang.org/x/net/context"
14 13 
 )
15 14
16 15 
 func TestInfoBinaryCommits(t *testing.T) {
integration/system/info_test.go
History View file @ 7d62e40
... ... 
@@ -1,13 +1,13 @@
1 1 
 package system // import "github.com/docker/docker/integration/system"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"fmt"
5 6 
 	"testing"
6 7
7 8 
 	"github.com/docker/docker/internal/test/request"
8 9 
 	"github.com/gotestyourself/gotestyourself/assert"
9 10 
 	is "github.com/gotestyourself/gotestyourself/assert/cmp"
10 
-	"golang.org/x/net/context"
11 11 
 )
12 12
13 13 
 func TestInfoAPI(t *testing.T) {
integration/system/login_test.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package system // import "github.com/docker/docker/integration/system"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"testing"
5 6
6 7 
 	"github.com/docker/docker/api/types"
... ... 
@@ -9,7 +10,6 @@ import (
9 9 
 	"github.com/gotestyourself/gotestyourself/assert"
10 10 
 	is "github.com/gotestyourself/gotestyourself/assert/cmp"
11 11 
 	"github.com/gotestyourself/gotestyourself/skip"
12 
-	"golang.org/x/net/context"
13 12 
 )
14 13
15 14 
 // Test case for GitHub 22244
integration/system/version_test.go
History View file @ 7d62e40
... ... 
@@ -1,12 +1,12 @@
1 1 
 package system // import "github.com/docker/docker/integration/system"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"testing"
5 6
6 7 
 	"github.com/docker/docker/internal/test/request"
7 8 
 	"github.com/gotestyourself/gotestyourself/assert"
8 9 
 	is "github.com/gotestyourself/gotestyourself/assert/cmp"
9 
-	"golang.org/x/net/context"
10 10 
 )
11 11
12 12 
 func TestVersion(t *testing.T) {
internal/test/environment/clean.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package environment // import "github.com/docker/docker/internal/test/environment"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"regexp"
5 6 
 	"strings"
6 7
... ... 
@@ -9,7 +10,6 @@ import (
9 9 
 	"github.com/docker/docker/client"
10 10 
 	"github.com/docker/docker/internal/test"
11 11 
 	"github.com/gotestyourself/gotestyourself/assert"
12 
-	"golang.org/x/net/context"
13 12 
 )
14 13
15 14 
 type testingT interface {
internal/test/environment/environment.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package environment // import "github.com/docker/docker/internal/test/environment"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"fmt"
5 6 
 	"os"
6 7 
 	"path/filepath"
... ... 
@@ -10,7 +11,6 @@ import (
10 10 
 	"github.com/docker/docker/client"
11 11 
 	"github.com/docker/docker/internal/test/fixtures/load"
12 12 
 	"github.com/pkg/errors"
13 
-	"golang.org/x/net/context"
14 13 
 )
15 14
16 15 
 // Execution contains information about the current test execution and daemon
internal/test/fixtures/load/frozen.go
History View file @ 7d62e40
... ... 
@@ -3,14 +3,13 @@ package load // import "github.com/docker/docker/internal/test/fixtures/load"
3 3 
 import (
4 4 
 	"bufio"
5 5 
 	"bytes"
6 
+	"context"
6 7 
 	"os"
7 8 
 	"os/exec"
8 9 
 	"path/filepath"
9 10 
 	"strings"
10 11 
 	"sync"
11 12
12 
-	"context"
13 
-
14 13 
 	"github.com/docker/docker/api/types"
15 14 
 	"github.com/docker/docker/client"
16 15 
 	"github.com/docker/docker/pkg/jsonmessage"
internal/test/fixtures/plugin/plugin.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package plugin // import "github.com/docker/docker/internal/test/fixtures/plugin"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"encoding/json"
5 6 
 	"io"
6 7 
 	"io/ioutil"
... ... 
@@ -14,7 +15,6 @@ import (
14 14 
 	"github.com/docker/docker/plugin"
15 15 
 	"github.com/docker/docker/registry"
16 16 
 	"github.com/pkg/errors"
17 
-	"golang.org/x/net/context"
18 17 
 )
19 18
20 19 
 // CreateOpt is is passed used to change the default plugin config before
pkg/authorization/middleware.go
History View file @ 7d62e40
... ... 
@@ -1,12 +1,12 @@
1 1 
 package authorization // import "github.com/docker/docker/pkg/authorization"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"net/http"
5 6 
 	"sync"
6 7
7 8 
 	"github.com/docker/docker/pkg/plugingetter"
8 9 
 	"github.com/sirupsen/logrus"
9 
-	"golang.org/x/net/context"
10 10 
 )
11 11
12 12 
 // Middleware uses a list of plugins to
pkg/authorization/middleware_unix_test.go
History View file @ 7d62e40
... ... 
@@ -3,6 +3,7 @@
3 3 
 package authorization // import "github.com/docker/docker/pkg/authorization"
4 4
5 5 
 import (
6 
+	"context"
6 7 
 	"net/http"
7 8 
 	"net/http/httptest"
8 9 
 	"testing"
... ... 
@@ -10,7 +11,6 @@ import (
10 10 
 	"github.com/docker/docker/pkg/plugingetter"
11 11 
 	"github.com/gotestyourself/gotestyourself/assert"
12 12 
 	is "github.com/gotestyourself/gotestyourself/assert/cmp"
13 
-	"golang.org/x/net/context"
14 13 
 )
15 14
16 15 
 func TestMiddlewareWrapHandler(t *testing.T) {
pkg/ioutils/readers.go
History View file @ 7d62e40
... ... 
@@ -1,11 +1,10 @@
1 1 
 package ioutils // import "github.com/docker/docker/pkg/ioutils"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"crypto/sha256"
5 6 
 	"encoding/hex"
6 7 
 	"io"
7 
-
8 
-	"golang.org/x/net/context"
9 8 
 )
10 9
11 10 
 // ReadCloserWrapper wraps an io.Reader, and implements an io.ReadCloser
pkg/ioutils/readers_test.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package ioutils // import "github.com/docker/docker/pkg/ioutils"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"fmt"
5 6 
 	"io/ioutil"
6 7 
 	"strings"
... ... 
@@ -9,7 +10,6 @@ import (
9 9
10 10 
 	"github.com/gotestyourself/gotestyourself/assert"
11 11 
 	is "github.com/gotestyourself/gotestyourself/assert/cmp"
12 
-	"golang.org/x/net/context"
13 12 
 )
14 13
15 14 
 // Implement io.Reader
plugin/backend_linux.go
History View file @ 7d62e40
... ... 
@@ -3,6 +3,7 @@ package plugin // import "github.com/docker/docker/plugin"
3 3 
 import (
4 4 
 	"archive/tar"
5 5 
 	"compress/gzip"
6 
+	"context"
6 7 
 	"encoding/json"
7 8 
 	"io"
8 9 
 	"io/ioutil"
... ... 
@@ -36,7 +37,6 @@ import (
36 36 
 	specs "github.com/opencontainers/image-spec/specs-go/v1"
37 37 
 	"github.com/pkg/errors"
38 38 
 	"github.com/sirupsen/logrus"
39 
-	"golang.org/x/net/context"
40 39 
 )
41 40
42 41 
 var acceptedPluginFilterTags = map[string]bool{
plugin/backend_unsupported.go
History View file @ 7d62e40
... ... 
@@ -3,6 +3,7 @@
3 3 
 package plugin // import "github.com/docker/docker/plugin"
4 4
5 5 
 import (
6 
+	"context"
6 7 
 	"errors"
7 8 
 	"io"
8 9 
 	"net/http"
... ... 
@@ -10,7 +11,6 @@ import (
10 10 
 	"github.com/docker/distribution/reference"
11 11 
 	"github.com/docker/docker/api/types"
12 12 
 	"github.com/docker/docker/api/types/filters"
13 
-	"golang.org/x/net/context"
14 13 
 )
15 14
16 15 
 var errNotSupported = errors.New("plugins are not supported on this platform")
plugin/blobstore.go
History View file @ 7d62e40
... ... 
@@ -1,6 +1,7 @@
1 1 
 package plugin // import "github.com/docker/docker/plugin"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"fmt"
5 6 
 	"io"
6 7 
 	"io/ioutil"
... ... 
@@ -18,7 +19,6 @@ import (
18 18 
 	specs "github.com/opencontainers/image-spec/specs-go/v1"
19 19 
 	"github.com/pkg/errors"
20 20 
 	"github.com/sirupsen/logrus"
21 
-	"golang.org/x/net/context"
22 21 
 )
23 22
24 23 
 type blobstore interface {
registry/service.go
History View file @ 7d62e40
... ... 
@@ -1,14 +1,13 @@
1 1 
 package registry // import "github.com/docker/docker/registry"
2 2
3 3 
 import (
4 
+	"context"
4 5 
 	"crypto/tls"
5 6 
 	"net/http"
6 7 
 	"net/url"
7 8 
 	"strings"
8 9 
 	"sync"
9 10
10 
-	"golang.org/x/net/context"
11 
-
12 11 
 	"github.com/docker/distribution/reference"
13 12 
 	"github.com/docker/distribution/registry/client/auth"
14 13 
 	"github.com/docker/docker/api/types"