diff options
346 files changed, 369 insertions, 426 deletions
diff --git a/api/server/backend/build/backend.go b/api/server/backend/build/backend.go index 458c304e8f..22ce9cef7c 100644 --- a/api/server/backend/build/backend.go +++ b/api/server/backend/build/backend.go @@ -1,6 +1,7 @@ package build // import "github.com/docker/docker/api/server/backend/build" import ( + "context" "fmt" "github.com/docker/distribution/reference" @@ -11,7 +12,6 @@ import ( "github.com/docker/docker/image" "github.com/docker/docker/pkg/stringid" "github.com/pkg/errors" - "golang.org/x/net/context" ) // ImageComponent provides an interface for working with images diff --git a/api/server/httputils/httputils.go b/api/server/httputils/httputils.go index fa1370692d..5a6854415c 100644 --- a/api/server/httputils/httputils.go +++ b/api/server/httputils/httputils.go @@ -1,6 +1,7 @@ package httputils // import "github.com/docker/docker/api/server/httputils" import ( + "context" "io" "mime" "net/http" @@ -9,7 +10,6 @@ import ( "github.com/docker/docker/errdefs" "github.com/pkg/errors" "github.com/sirupsen/logrus" - "golang.org/x/net/context" ) type contextKey string diff --git a/api/server/httputils/write_log_stream.go b/api/server/httputils/write_log_stream.go index 5e6793d486..9e769c8b4d 100644 --- a/api/server/httputils/write_log_stream.go +++ b/api/server/httputils/write_log_stream.go @@ -1,13 +1,12 @@ package httputils // import "github.com/docker/docker/api/server/httputils" import ( + "context" "fmt" "io" "net/url" "sort" - "golang.org/x/net/context" - "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/backend" "github.com/docker/docker/pkg/ioutils" diff --git a/api/server/middleware/cors.go b/api/server/middleware/cors.go index 48b436b30d..54374690e6 100644 --- a/api/server/middleware/cors.go +++ b/api/server/middleware/cors.go @@ -1,10 +1,10 @@ package middleware // import "github.com/docker/docker/api/server/middleware" import ( + "context" "net/http" "github.com/sirupsen/logrus" - "golang.org/x/net/context" ) // CORSMiddleware injects CORS headers to each request diff --git a/api/server/middleware/debug.go b/api/server/middleware/debug.go index 5a00196152..2cef1d46c3 100644 --- a/api/server/middleware/debug.go +++ b/api/server/middleware/debug.go @@ -2,6 +2,7 @@ package middleware // import "github.com/docker/docker/api/server/middleware" import ( "bufio" + "context" "encoding/json" "io" "net/http" @@ -10,7 +11,6 @@ import ( "github.com/docker/docker/api/server/httputils" "github.com/docker/docker/pkg/ioutils" "github.com/sirupsen/logrus" - "golang.org/x/net/context" ) // DebugRequestMiddleware dumps the request to logger diff --git a/api/server/middleware/experimental.go b/api/server/middleware/experimental.go index c4075b90dc..4df5decce4 100644 --- a/api/server/middleware/experimental.go +++ b/api/server/middleware/experimental.go @@ -1,9 +1,8 @@ package middleware // import "github.com/docker/docker/api/server/middleware" import ( + "context" "net/http" - - "golang.org/x/net/context" ) // ExperimentalMiddleware is a the middleware in charge of adding the diff --git a/api/server/middleware/middleware.go b/api/server/middleware/middleware.go index 4bc3d14146..43483f1e4c 100644 --- a/api/server/middleware/middleware.go +++ b/api/server/middleware/middleware.go @@ -1,9 +1,8 @@ package middleware // import "github.com/docker/docker/api/server/middleware" import ( + "context" "net/http" - - "golang.org/x/net/context" ) // Middleware is an interface to allow the use of ordinary functions as Docker API filters. diff --git a/api/server/middleware/version.go b/api/server/middleware/version.go index b9ac5ce49a..88b11ca377 100644 --- a/api/server/middleware/version.go +++ b/api/server/middleware/version.go @@ -1,13 +1,13 @@ package middleware // import "github.com/docker/docker/api/server/middleware" import ( + "context" "fmt" "net/http" "runtime" "github.com/docker/docker/api/server/httputils" "github.com/docker/docker/api/types/versions" - "golang.org/x/net/context" ) // VersionMiddleware is a middleware that diff --git a/api/server/middleware/version_test.go b/api/server/middleware/version_test.go index f426acf0a3..c439c8abfc 100644 --- a/api/server/middleware/version_test.go +++ b/api/server/middleware/version_test.go @@ -1,6 +1,7 @@ package middleware // import "github.com/docker/docker/api/server/middleware" import ( + "context" "net/http" "net/http/httptest" "runtime" @@ -9,7 +10,6 @@ import ( "github.com/docker/docker/api/server/httputils" "github.com/gotestyourself/gotestyourself/assert" is "github.com/gotestyourself/gotestyourself/assert/cmp" - "golang.org/x/net/context" ) func TestVersionMiddlewareVersion(t *testing.T) { diff --git a/api/server/router/build/backend.go b/api/server/router/build/backend.go index 84feb4bdd7..d82ef63af1 100644 --- a/api/server/router/build/backend.go +++ b/api/server/router/build/backend.go @@ -1,9 +1,10 @@ package build // import "github.com/docker/docker/api/server/router/build" import ( + "context" + "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/backend" - "golang.org/x/net/context" ) // Backend abstracts an image builder whose only purpose is to build an image referenced by an imageID. diff --git a/api/server/router/build/build_routes.go b/api/server/router/build/build_routes.go index 09a167062a..1261cf4777 100644 --- a/api/server/router/build/build_routes.go +++ b/api/server/router/build/build_routes.go @@ -2,6 +2,7 @@ package build // import "github.com/docker/docker/api/server/router/build" import ( "bytes" + "context" "encoding/base64" "encoding/json" "fmt" @@ -25,7 +26,6 @@ import ( units "github.com/docker/go-units" "github.com/pkg/errors" "github.com/sirupsen/logrus" - "golang.org/x/net/context" ) type invalidIsolationError string diff --git a/api/server/router/checkpoint/checkpoint_routes.go b/api/server/router/checkpoint/checkpoint_routes.go index 0a7a1c6a08..6c03f976e2 100644 --- a/api/server/router/checkpoint/checkpoint_routes.go +++ b/api/server/router/checkpoint/checkpoint_routes.go @@ -1,12 +1,12 @@ package checkpoint // import "github.com/docker/docker/api/server/router/checkpoint" import ( + "context" "encoding/json" "net/http" "github.com/docker/docker/api/server/httputils" "github.com/docker/docker/api/types" - "golang.org/x/net/context" ) func (s *checkpointRouter) postContainerCheckpoint(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error { diff --git a/api/server/router/container/backend.go b/api/server/router/container/backend.go index 5072083c69..75ea1d82b7 100644 --- a/api/server/router/container/backend.go +++ b/api/server/router/container/backend.go @@ -1,10 +1,9 @@ package container // import "github.com/docker/docker/api/server/router/container" import ( + "context" "io" - "golang.org/x/net/context" - "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/backend" "github.com/docker/docker/api/types/container" diff --git a/api/server/router/container/container_routes.go b/api/server/router/container/container_routes.go index 0527810f23..9282cea09c 100644 --- a/api/server/router/container/container_routes.go +++ b/api/server/router/container/container_routes.go @@ -1,6 +1,7 @@ package container // import "github.com/docker/docker/api/server/router/container" import ( + "context" "encoding/json" "fmt" "io" @@ -20,7 +21,6 @@ import ( "github.com/docker/docker/pkg/signal" "github.com/pkg/errors" "github.com/sirupsen/logrus" - "golang.org/x/net/context" "golang.org/x/net/websocket" ) diff --git a/api/server/router/container/copy.go b/api/server/router/container/copy.go index 8851278c05..837836d001 100644 --- a/api/server/router/container/copy.go +++ b/api/server/router/container/copy.go @@ -3,6 +3,7 @@ package container // import "github.com/docker/docker/api/server/router/containe import ( "compress/flate" "compress/gzip" + "context" "encoding/base64" "encoding/json" "io" @@ -12,7 +13,6 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/versions" gddohttputil "github.com/golang/gddo/httputil" - "golang.org/x/net/context" ) type pathError struct{} diff --git a/api/server/router/container/exec.go b/api/server/router/container/exec.go index 8fe2dabd51..25125edb5f 100644 --- a/api/server/router/container/exec.go +++ b/api/server/router/container/exec.go @@ -1,6 +1,7 @@ package container // import "github.com/docker/docker/api/server/router/container" import ( + "context" "encoding/json" "fmt" "io" @@ -13,7 +14,6 @@ import ( "github.com/docker/docker/errdefs" "github.com/docker/docker/pkg/stdcopy" "github.com/sirupsen/logrus" - "golang.org/x/net/context" ) func (s *containerRouter) getExecByID(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error { diff --git a/api/server/router/container/inspect.go b/api/server/router/container/inspect.go index 4ff72cc9c3..5c78d15bc9 100644 --- a/api/server/router/container/inspect.go +++ b/api/server/router/container/inspect.go @@ -1,10 +1,10 @@ package container // import "github.com/docker/docker/api/server/router/container" import ( + "context" "net/http" "github.com/docker/docker/api/server/httputils" - "golang.org/x/net/context" ) // getContainersByName inspects container's configuration and serializes it as json. diff --git a/api/server/router/debug/debug.go b/api/server/router/debug/debug.go index 9d9e9cf0c1..ad05b68eb9 100644 --- a/api/server/router/debug/debug.go +++ b/api/server/router/debug/debug.go @@ -1,13 +1,13 @@ package debug // import "github.com/docker/docker/api/server/router/debug" import ( + "context" "expvar" "net/http" "net/http/pprof" "github.com/docker/docker/api/server/httputils" "github.com/docker/docker/api/server/router" - "golang.org/x/net/context" ) // NewRouter creates a new debug router diff --git a/api/server/router/debug/debug_routes.go b/api/server/router/debug/debug_routes.go index 324b46ebd5..125bed72b5 100644 --- a/api/server/router/debug/debug_routes.go +++ b/api/server/router/debug/debug_routes.go @@ -1,10 +1,9 @@ package debug // import "github.com/docker/docker/api/server/router/debug" import ( + "context" "net/http" "net/http/pprof" - - "golang.org/x/net/context" ) func handlePprof(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error { diff --git a/api/server/router/distribution/backend.go b/api/server/router/distribution/backend.go index 8ba016114b..5b881f036b 100644 --- a/api/server/router/distribution/backend.go +++ b/api/server/router/distribution/backend.go @@ -1,10 +1,11 @@ package distribution // import "github.com/docker/docker/api/server/router/distribution" import ( + "context" + "github.com/docker/distribution" "github.com/docker/distribution/reference" "github.com/docker/docker/api/types" - "golang.org/x/net/context" ) // Backend is all the methods that need to be implemented diff --git a/api/server/router/distribution/distribution_routes.go b/api/server/router/distribution/distribution_routes.go index f10e208a8b..531dba69fc 100644 --- a/api/server/router/distribution/distribution_routes.go +++ b/api/server/router/distribution/distribution_routes.go @@ -1,6 +1,7 @@ package distribution // import "github.com/docker/docker/api/server/router/distribution" import ( + "context" "encoding/base64" "encoding/json" "net/http" @@ -15,7 +16,6 @@ import ( registrytypes "github.com/docker/docker/api/types/registry" "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pkg/errors" - "golang.org/x/net/context" ) func (s *distributionRouter) getDistributionInfo(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error { diff --git a/api/server/router/experimental.go b/api/server/router/experimental.go index 727670ce76..c42e53a3d9 100644 --- a/api/server/router/experimental.go +++ b/api/server/router/experimental.go @@ -1,10 +1,9 @@ package router // import "github.com/docker/docker/api/server/router" import ( + "context" "net/http" - "golang.org/x/net/context" - "github.com/docker/docker/api/server/httputils" ) diff --git a/api/server/router/image/backend.go b/api/server/router/image/backend.go index e4d4b7d1bb..93c47cf638 100644 --- a/api/server/router/image/backend.go +++ b/api/server/router/image/backend.go @@ -1,13 +1,13 @@ package image // import "github.com/docker/docker/api/server/router/image" import ( + "context" "io" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/image" "github.com/docker/docker/api/types/registry" - "golang.org/x/net/context" ) // Backend is all the methods that need to be implemented diff --git a/api/server/router/image/image_routes.go b/api/server/router/image/image_routes.go index cb497134a2..8e32d0292e 100644 --- a/api/server/router/image/image_routes.go +++ b/api/server/router/image/image_routes.go @@ -1,6 +1,7 @@ package image // import "github.com/docker/docker/api/server/router/image" import ( + "context" "encoding/base64" "encoding/json" "fmt" @@ -19,7 +20,6 @@ import ( "github.com/docker/docker/registry" specs "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pkg/errors" - "golang.org/x/net/context" ) // Creates an image from Pull or from Import diff --git a/api/server/router/local.go b/api/server/router/local.go index 86fd692068..79a323928e 100644 --- a/api/server/router/local.go +++ b/api/server/router/local.go @@ -1,10 +1,10 @@ package router // import "github.com/docker/docker/api/server/router" import ( + "context" "net/http" "github.com/docker/docker/api/server/httputils" - "golang.org/x/net/context" ) // RouteWrapper wraps a route with extra functionality. diff --git a/api/server/router/network/backend.go b/api/server/router/network/backend.go index fa93b9ee0a..1bab353a5a 100644 --- a/api/server/router/network/backend.go +++ b/api/server/router/network/backend.go @@ -1,7 +1,7 @@ package network // import "github.com/docker/docker/api/server/router/network" import ( - "golang.org/x/net/context" + "context" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" diff --git a/api/server/router/network/network_routes.go b/api/server/router/network/network_routes.go index 4f7a400b6d..0248662a49 100644 --- a/api/server/router/network/network_routes.go +++ b/api/server/router/network/network_routes.go @@ -1,13 +1,12 @@ package network // import "github.com/docker/docker/api/server/router/network" import ( + "context" "encoding/json" "net/http" "strconv" "strings" - "golang.org/x/net/context" - "github.com/docker/docker/api/server/httputils" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" diff --git a/api/server/router/plugin/backend.go b/api/server/router/plugin/backend.go index 7f8a71ce1f..d885ebb33a 100644 --- a/api/server/router/plugin/backend.go +++ b/api/server/router/plugin/backend.go @@ -1,6 +1,7 @@ package plugin // import "github.com/docker/docker/api/server/router/plugin" import ( + "context" "io" "net/http" @@ -8,7 +9,6 @@ import ( enginetypes "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" "github.com/docker/docker/plugin" - "golang.org/x/net/context" ) // Backend for Plugin diff --git a/api/server/router/plugin/plugin_routes.go b/api/server/router/plugin/plugin_routes.go index 5a3ab99fd3..4e816391d1 100644 --- a/api/server/router/plugin/plugin_routes.go +++ b/api/server/router/plugin/plugin_routes.go @@ -1,6 +1,7 @@ package plugin // import "github.com/docker/docker/api/server/router/plugin" import ( + "context" "encoding/base64" "encoding/json" "net/http" @@ -14,7 +15,6 @@ import ( "github.com/docker/docker/pkg/ioutils" "github.com/docker/docker/pkg/streamformatter" "github.com/pkg/errors" - "golang.org/x/net/context" ) func parseHeaders(headers http.Header) (map[string][]string, *types.AuthConfig) { diff --git a/api/server/router/session/backend.go b/api/server/router/session/backend.go index 1a7eb80780..d9b14d480c 100644 --- a/api/server/router/session/backend.go +++ b/api/server/router/session/backend.go @@ -1,9 +1,8 @@ package session // import "github.com/docker/docker/api/server/router/session" import ( + "context" "net/http" - - "golang.org/x/net/context" ) // Backend abstracts an session receiver from an http request. diff --git a/api/server/router/session/session_routes.go b/api/server/router/session/session_routes.go index 64a5cd70cc..691ac62281 100644 --- a/api/server/router/session/session_routes.go +++ b/api/server/router/session/session_routes.go @@ -1,10 +1,10 @@ package session // import "github.com/docker/docker/api/server/router/session" import ( + "context" "net/http" "github.com/docker/docker/errdefs" - "golang.org/x/net/context" ) func (sr *sessionRouter) startSession(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error { diff --git a/api/server/router/swarm/backend.go b/api/server/router/swarm/backend.go index c37cd78bcd..d0c7e60fb3 100644 --- a/api/server/router/swarm/backend.go +++ b/api/server/router/swarm/backend.go @@ -1,10 +1,11 @@ package swarm // import "github.com/docker/docker/api/server/router/swarm" import ( + "context" + basictypes "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/backend" types "github.com/docker/docker/api/types/swarm" - "golang.org/x/net/context" ) // Backend abstracts a swarm manager. diff --git a/api/server/router/swarm/cluster_routes.go b/api/server/router/swarm/cluster_routes.go index 6b13bf331d..a702488602 100644 --- a/api/server/router/swarm/cluster_routes.go +++ b/api/server/router/swarm/cluster_routes.go @@ -1,6 +1,7 @@ package swarm // import "github.com/docker/docker/api/server/router/swarm" import ( + "context" "encoding/json" "fmt" "net/http" @@ -15,7 +16,6 @@ import ( "github.com/docker/docker/errdefs" "github.com/pkg/errors" "github.com/sirupsen/logrus" - "golang.org/x/net/context" ) func (sr *swarmRouter) initCluster(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error { diff --git a/api/server/router/swarm/helpers.go b/api/server/router/swarm/helpers.go index f23b96bcc0..1f57074f92 100644 --- a/api/server/router/swarm/helpers.go +++ b/api/server/router/swarm/helpers.go @@ -1,6 +1,7 @@ package swarm // import "github.com/docker/docker/api/server/router/swarm" import ( + "context" "fmt" "io" "net/http" @@ -8,7 +9,6 @@ import ( "github.com/docker/docker/api/server/httputils" basictypes "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/backend" - "golang.org/x/net/context" ) // swarmLogs takes an http response, request, and selector, and writes the logs diff --git a/api/server/router/system/backend.go b/api/server/router/system/backend.go index cc2435884d..f5d2d98101 100644 --- a/api/server/router/system/backend.go +++ b/api/server/router/system/backend.go @@ -1,13 +1,13 @@ package system // import "github.com/docker/docker/api/server/router/system" import ( + "context" "time" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/events" "github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/swarm" - "golang.org/x/net/context" ) // Backend is the methods that need to be implemented to provide diff --git a/api/server/router/system/system_routes.go b/api/server/router/system/system_routes.go index 2abb31c162..573496886c 100644 --- a/api/server/router/system/system_routes.go +++ b/api/server/router/system/system_routes.go @@ -1,6 +1,7 @@ package system // import "github.com/docker/docker/api/server/router/system" import ( + "context" "encoding/json" "fmt" "net/http" @@ -16,7 +17,6 @@ import ( "github.com/docker/docker/pkg/ioutils" pkgerrors "github.com/pkg/errors" "github.com/sirupsen/logrus" - "golang.org/x/net/context" ) func optionsHandler(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error { diff --git a/api/server/router/volume/backend.go b/api/server/router/volume/backend.go index adb97615f2..8be6fea41c 100644 --- a/api/server/router/volume/backend.go +++ b/api/server/router/volume/backend.go @@ -1,7 +1,7 @@ package volume // import "github.com/docker/docker/api/server/router/volume" import ( - "golang.org/x/net/context" + "context" // TODO return types need to be refactored into pkg "github.com/docker/docker/api/types" diff --git a/api/server/router/volume/volume_routes.go b/api/server/router/volume/volume_routes.go index 731008660f..01d710e727 100644 --- a/api/server/router/volume/volume_routes.go +++ b/api/server/router/volume/volume_routes.go @@ -1,6 +1,7 @@ package volume // import "github.com/docker/docker/api/server/router/volume" import ( + "context" "encoding/json" "errors" "io" @@ -10,7 +11,6 @@ import ( "github.com/docker/docker/api/types/filters" volumetypes "github.com/docker/docker/api/types/volume" "github.com/docker/docker/errdefs" - "golang.org/x/net/context" ) func (v *volumeRouter) getVolumesList(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error { diff --git a/api/server/server.go b/api/server/server.go index 2bcf1cabf8..1cce7060a4 100644 --- a/api/server/server.go +++ b/api/server/server.go @@ -1,6 +1,7 @@ package server // import "github.com/docker/docker/api/server" import ( + "context" "crypto/tls" "net" "net/http" @@ -13,7 +14,6 @@ import ( "github.com/docker/docker/dockerversion" "github.com/gorilla/mux" "github.com/sirupsen/logrus" - "golang.org/x/net/context" ) // versionMatcher defines a variable matcher to be parsed by the router diff --git a/api/server/server_test.go b/api/server/server_test.go index 5374af89d7..3fbe1c9d13 100644 --- a/api/server/server_test.go +++ b/api/server/server_test.go @@ -6,11 +6,11 @@ import ( "strings" "testing" + "context" + "github.com/docker/docker/api" "github.com/docker/docker/api/server/httputils" "github.com/docker/docker/api/server/middleware" - - "golang.org/x/net/context" ) func TestMiddlewares(t *testing.T) { diff --git a/builder/builder.go b/builder/builder.go index 6da0e49e10..3c5edb0679 100644 --- a/builder/builder.go +++ b/builder/builder.go @@ -5,6 +5,7 @@ package builder // import "github.com/docker/docker/builder" import ( + "context" "io" "github.com/docker/docker/api/types" @@ -14,7 +15,6 @@ import ( "github.com/docker/docker/image" "github.com/docker/docker/layer" "github.com/docker/docker/pkg/containerfs" - "golang.org/x/net/context" ) const ( diff --git a/builder/dockerfile/builder.go b/builder/dockerfile/builder.go index d328235a14..cdc75c3c32 100644 --- a/builder/dockerfile/builder.go +++ b/builder/dockerfile/builder.go @@ -2,6 +2,7 @@ package dockerfile // import "github.com/docker/docker/builder/dockerfile" import ( "bytes" + "context" "fmt" "io" "io/ioutil" @@ -25,7 +26,6 @@ import ( "github.com/moby/buildkit/session" "github.com/pkg/errors" "github.com/sirupsen/logrus" - "golang.org/x/net/context" "golang.org/x/sync/syncmap" ) diff --git a/builder/dockerfile/clientsession.go b/builder/dockerfile/clientsession.go index b4bea50223..b48090d7b5 100644 --- a/builder/dockerfile/clientsession.go +++ b/builder/dockerfile/clientsession.go @@ -1,6 +1,7 @@ package dockerfile // import "github.com/docker/docker/builder/dockerfile" import ( + "context" "time" "github.com/docker/docker/builder/fscache" @@ -8,7 +9,6 @@ import ( "github.com/moby/buildkit/session" "github.com/moby/buildkit/session/filesync" "github.com/pkg/errors" - "golang.org/x/net/context" ) const sessionConnectTimeout = 5 * time.Second diff --git a/builder/dockerfile/containerbackend.go b/builder/dockerfile/containerbackend.go index 2080fc0f4c..54adfb13f7 100644 --- a/builder/dockerfile/containerbackend.go +++ b/builder/dockerfile/containerbackend.go @@ -1,6 +1,7 @@ package dockerfile // import "github.com/docker/docker/builder/dockerfile" import ( + "context" "fmt" "io" @@ -11,7 +12,6 @@ import ( "github.com/docker/docker/pkg/stringid" "github.com/pkg/errors" "github.com/sirupsen/logrus" - "golang.org/x/net/context" ) type containerManager struct { diff --git a/builder/dockerfile/imagecontext.go b/builder/dockerfile/imagecontext.go index fd2b942393..53a4b9774b 100644 --- a/builder/dockerfile/imagecontext.go +++ b/builder/dockerfile/imagecontext.go @@ -1,6 +1,7 @@ package dockerfile // import "github.com/docker/docker/builder/dockerfile" import ( + "context" "runtime" "github.com/docker/docker/api/types/backend" @@ -8,7 +9,6 @@ import ( dockerimage "github.com/docker/docker/image" "github.com/pkg/errors" "github.com/sirupsen/logrus" - "golang.org/x/net/context" ) type getAndMountFunc func(string, bool, string) (builder.Image, builder.ROLayer, error) diff --git a/builder/dockerfile/mockbackend_test.go b/builder/dockerfile/mockbackend_test.go index 77bc8b5715..45cba00a8c 100644 --- a/builder/dockerfile/mockbackend_test.go +++ b/builder/dockerfile/mockbackend_test.go @@ -1,6 +1,7 @@ package dockerfile // import "github.com/docker/docker/builder/dockerfile" import ( + "context" "encoding/json" "io" "runtime" @@ -13,7 +14,6 @@ import ( "github.com/docker/docker/image" "github.com/docker/docker/layer" "github.com/docker/docker/pkg/containerfs" - "golang.org/x/net/context" ) // MockBackend implements the builder.Backend interface for unit testing diff --git a/builder/fscache/fscache.go b/builder/fscache/fscache.go index cb2b4e34d1..e80f3d5bce 100644 --- a/builder/fscache/fscache.go +++ b/builder/fscache/fscache.go @@ -2,6 +2,7 @@ package fscache // import "github.com/docker/docker/builder/fscache" import ( "archive/tar" + "context" "crypto/sha256" "encoding/json" "hash" @@ -22,7 +23,6 @@ import ( "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/tonistiigi/fsutil" - "golang.org/x/net/context" "golang.org/x/sync/singleflight" ) diff --git a/builder/fscache/fscache_test.go b/builder/fscache/fscache_test.go index 778fea1b14..16712ff743 100644 --- a/builder/fscache/fscache_test.go +++ b/builder/fscache/fscache_test.go @@ -1,6 +1,7 @@ package fscache // import "github.com/docker/docker/builder/fscache" import ( + "context" "io/ioutil" "os" "path/filepath" @@ -10,7 +11,6 @@ import ( "github.com/gotestyourself/gotestyourself/assert" is "github.com/gotestyourself/gotestyourself/assert/cmp" "github.com/moby/buildkit/session/filesync" - "golang.org/x/net/context" ) func TestFSCache(t *testing.T) { diff --git a/client/build_prune.go b/client/build_prune.go index 3ad07ccb85..c4772a04e7 100644 --- a/client/build_prune.go +++ b/client/build_prune.go @@ -1,11 +1,11 @@ package client // import "github.com/docker/docker/client" import ( + "context" "encoding/json" "fmt" "github.com/docker/docker/api/types" - "golang.org/x/net/context" ) // BuildCachePrune requests the daemon to delete unused cache data diff --git a/client/checkpoint_create.go b/client/checkpoint_create.go index 6441ed2501..921024fe4f 100644 --- a/client/checkpoint_create.go +++ b/client/checkpoint_create.go @@ -1,8 +1,9 @@ package client // import "github.com/docker/docker/client" import ( + "context" + "github.com/docker/docker/api/types" - "golang.org/x/net/context" ) // CheckpointCreate creates a checkpoint from the given container with the given name diff --git a/client/checkpoint_create_test.go b/client/checkpoint_create_test.go index bd3e731e67..5703c21904 100644 --- a/client/checkpoint_create_test.go +++ b/client/checkpoint_create_test.go @@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "encoding/json" "fmt" "io/ioutil" @@ -10,7 +11,6 @@ import ( "testing" "github.com/docker/docker/api/types" - "golang.org/x/net/context" ) func TestCheckpointCreateError(t *testing.T) { diff --git a/client/checkpoint_delete.go b/client/checkpoint_delete.go index 5b97c35c6b..54f55fa76e 100644 --- a/client/checkpoint_delete.go +++ b/client/checkpoint_delete.go @@ -1,10 +1,10 @@ package client // import "github.com/docker/docker/client" import ( + "context" "net/url" "github.com/docker/docker/api/types" - "golang.org/x/net/context" ) // CheckpointDelete deletes the checkpoint with the given name from the given container diff --git a/client/checkpoint_delete_test.go b/client/checkpoint_delete_test.go index 6effb27686..117630d61a 100644 --- a/client/checkpoint_delete_test.go +++ b/client/checkpoint_delete_test.go @@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "fmt" "io/ioutil" "net/http" @@ -9,7 +10,6 @@ import ( "testing" "github.com/docker/docker/api/types" - "golang.org/x/net/context" ) func TestCheckpointDeleteError(t *testing.T) { diff --git a/client/checkpoint_list.go b/client/checkpoint_list.go index 8ba1ddff7f..2b73fb553f 100644 --- a/client/checkpoint_list.go +++ b/client/checkpoint_list.go @@ -1,11 +1,11 @@ package client // import "github.com/docker/docker/client" import ( + "context" "encoding/json" "net/url" "github.com/docker/docker/api/types" - "golang.org/x/net/context" ) // CheckpointList returns the checkpoints of the given container in the docker host diff --git a/client/checkpoint_list_test.go b/client/checkpoint_list_test.go index 1851435ca0..d5cfcda0e5 100644 --- a/client/checkpoint_list_test.go +++ b/client/checkpoint_list_test.go @@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "encoding/json" "fmt" "io/ioutil" @@ -10,7 +11,6 @@ import ( "testing" "github.com/docker/docker/api/types" - "golang.org/x/net/context" ) func TestCheckpointListError(t *testing.T) { diff --git a/client/client.go b/client/client.go index e129bb20f3..b8428128bb 100644 --- a/client/client.go +++ b/client/client.go @@ -42,6 +42,7 @@ For example, to list running containers (the equivalent of "docker ps"): package client // import "github.com/docker/docker/client" import ( + "context" "fmt" "net" "net/http" @@ -57,7 +58,6 @@ import ( "github.com/docker/go-connections/sockets" "github.com/docker/go-connections/tlsconfig" "github.com/pkg/errors" - "golang.org/x/net/context" ) // ErrRedirect is the error returned by checkRedirect when the request is non-GET. diff --git a/client/config_create.go b/client/config_create.go index b6d15b70e4..c8b802ad35 100644 --- a/client/config_create.go +++ b/client/config_create.go @@ -1,11 +1,11 @@ package client // import "github.com/docker/docker/client" import ( + "context" "encoding/json" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/swarm" - "golang.org/x/net/context" ) // ConfigCreate creates a new Config. diff --git a/client/config_create_test.go b/client/config_create_test.go index 2ee8f1fd40..8675e7f541 100644 --- a/client/config_create_test.go +++ b/client/config_create_test.go @@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "encoding/json" "fmt" "io/ioutil" @@ -13,7 +14,6 @@ import ( "github.com/docker/docker/api/types/swarm" "github.com/gotestyourself/gotestyourself/assert" is "github.com/gotestyourself/gotestyourself/assert/cmp" - "golang.org/x/net/context" ) func TestConfigCreateUnsupported(t *testing.T) { diff --git a/client/config_inspect.go b/client/config_inspect.go index 7ae1376ea7..4ac566ad89 100644 --- a/client/config_inspect.go +++ b/client/config_inspect.go @@ -2,11 +2,11 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "encoding/json" "io/ioutil" "github.com/docker/docker/api/types/swarm" - "golang.org/x/net/context" ) // ConfigInspectWithRaw returns the config information with raw data diff --git a/client/config_inspect_test.go b/client/config_inspect_test.go index 9d5af0bf8c..b0c30fa279 100644 --- a/client/config_inspect_test.go +++ b/client/config_inspect_test.go @@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "encoding/json" "fmt" "io/ioutil" @@ -13,7 +14,6 @@ import ( "github.com/gotestyourself/gotestyourself/assert" is "github.com/gotestyourself/gotestyourself/assert/cmp" "github.com/pkg/errors" - "golang.org/x/net/context" ) func TestConfigInspectNotFound(t *testing.T) { diff --git a/client/config_list.go b/client/config_list.go index b9d2632f6a..2b9d54606b 100644 --- a/client/config_list.go +++ b/client/config_list.go @@ -1,13 +1,13 @@ package client // import "github.com/docker/docker/client" import ( + "context" "encoding/json" "net/url" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/swarm" - "golang.org/x/net/context" ) // ConfigList returns the list of configs. diff --git a/client/config_list_test.go b/client/config_list_test.go index 0cd99c50d1..e01d3d4c9d 100644 --- a/client/config_list_test.go +++ b/client/config_list_test.go @@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "encoding/json" "fmt" "io/ioutil" @@ -14,7 +15,6 @@ import ( "github.com/docker/docker/api/types/swarm" "github.com/gotestyourself/gotestyourself/assert" is "github.com/gotestyourself/gotestyourself/assert/cmp" - "golang.org/x/net/context" ) func TestConfigListUnsupported(t *testing.T) { diff --git a/client/config_remove.go b/client/config_remove.go index 9c8f293f3e..a96871e98b 100644 --- a/client/config_remove.go +++ b/client/config_remove.go @@ -1,6 +1,6 @@ package client // import "github.com/docker/docker/client" -import "golang.org/x/net/context" +import "context" // ConfigRemove removes a Config. func (cli *Client) ConfigRemove(ctx context.Context, id string) error { diff --git a/client/config_remove_test.go b/client/config_remove_test.go index 25a5c4ac87..d574c5be0c 100644 --- a/client/config_remove_test.go +++ b/client/config_remove_test.go @@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "fmt" "io/ioutil" "net/http" @@ -10,7 +11,6 @@ import ( "github.com/gotestyourself/gotestyourself/assert" is "github.com/gotestyourself/gotestyourself/assert/cmp" - "golang.org/x/net/context" ) func TestConfigRemoveUnsupported(t *testing.T) { diff --git a/client/config_update.go b/client/config_update.go index 6b24024cd1..39e59cf858 100644 --- a/client/config_update.go +++ b/client/config_update.go @@ -1,11 +1,11 @@ package client // import "github.com/docker/docker/client" import ( + "context" "net/url" "strconv" "github.com/docker/docker/api/types/swarm" - "golang.org/x/net/context" ) // ConfigUpdate attempts to update a Config diff --git a/client/config_update_test.go b/client/config_update_test.go index a7eea2f8b1..8b82d42eda 100644 --- a/client/config_update_test.go +++ b/client/config_update_test.go @@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "fmt" "io/ioutil" "net/http" @@ -11,7 +12,6 @@ import ( "github.com/docker/docker/api/types/swarm" "github.com/gotestyourself/gotestyourself/assert" is "github.com/gotestyourself/gotestyourself/assert/cmp" - "golang.org/x/net/context" ) func TestConfigUpdateUnsupported(t *testing.T) { diff --git a/client/container_attach.go b/client/container_attach.go index 1a2a431975..88ba1ef639 100644 --- a/client/container_attach.go +++ b/client/container_attach.go @@ -1,10 +1,10 @@ package client // import "github.com/docker/docker/client" import ( + "context" "net/url" "github.com/docker/docker/api/types" - "golang.org/x/net/context" ) // ContainerAttach attaches a connection to a container in the server. diff --git a/client/container_commit.go b/client/container_commit.go index 95219beb17..377a2ea681 100644 --- a/client/container_commit.go +++ b/client/container_commit.go @@ -1,13 +1,13 @@ package client // import "github.com/docker/docker/client" import ( + "context" "encoding/json" "errors" "net/url" "github.com/docker/distribution/reference" "github.com/docker/docker/api/types" - "golang.org/x/net/context" ) // ContainerCommit applies changes into a container and creates a new tagged image. diff --git a/client/container_commit_test.go b/client/container_commit_test.go index 918734a87b..8e3fe8b730 100644 --- a/client/container_commit_test.go +++ b/client/container_commit_test.go @@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "encoding/json" "fmt" "io/ioutil" @@ -10,7 +11,6 @@ import ( "testing" "github.com/docker/docker/api/types" - "golang.org/x/net/context" ) func TestContainerCommitError(t *testing.T) { diff --git a/client/container_copy.go b/client/container_copy.go index 036298c17c..d706260cee 100644 --- a/client/container_copy.go +++ b/client/container_copy.go @@ -1,6 +1,7 @@ package client // import "github.com/docker/docker/client" import ( + "context" "encoding/base64" "encoding/json" "fmt" @@ -10,8 +11,6 @@ import ( "path/filepath" "strings" - "golang.org/x/net/context" - "github.com/docker/docker/api/types" ) diff --git a/client/container_copy_test.go b/client/container_copy_test.go index 8fc3445d50..efddbef20d 100644 --- a/client/container_copy_test.go +++ b/client/container_copy_test.go @@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "encoding/base64" "encoding/json" "fmt" @@ -10,8 +11,6 @@ import ( "strings" "testing" - "golang.org/x/net/context" - "github.com/docker/docker/api/types" ) diff --git a/client/container_create.go b/client/container_create.go index 0af82a19ec..d269a61894 100644 --- a/client/container_create.go +++ b/client/container_create.go @@ -1,6 +1,7 @@ package client // import "github.com/docker/docker/client" import ( + "context" "encoding/json" "net/url" "strings" @@ -8,7 +9,6 @@ import ( "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/network" "github.com/docker/docker/api/types/versions" - "golang.org/x/net/context" ) type configWrapper struct { diff --git a/client/container_create_test.go b/client/container_create_test.go index 6ad6fda09b..d46e70492d 100644 --- a/client/container_create_test.go +++ b/client/container_create_test.go @@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "encoding/json" "fmt" "io/ioutil" @@ -10,7 +11,6 @@ import ( "testing" "github.com/docker/docker/api/types/container" - "golang.org/x/net/context" ) func TestContainerCreateError(t *testing.T) { diff --git a/client/container_diff.go b/client/container_diff.go index f03ebf1da3..3b7c90c96c 100644 --- a/client/container_diff.go +++ b/client/container_diff.go @@ -1,11 +1,11 @@ package client // import "github.com/docker/docker/client" import ( + "context" "encoding/json" "net/url" "github.com/docker/docker/api/types/container" - "golang.org/x/net/context" ) // ContainerDiff shows differences in a container filesystem since it was started. diff --git a/client/container_diff_test.go b/client/container_diff_test.go index 5246f0607e..ac215f3403 100644 --- a/client/container_diff_test.go +++ b/client/container_diff_test.go @@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "encoding/json" "fmt" "io/ioutil" @@ -10,7 +11,6 @@ import ( "testing" "github.com/docker/docker/api/types/container" - "golang.org/x/net/context" ) func TestContainerDiffError(t *testing.T) { diff --git a/client/container_exec.go b/client/container_exec.go index 59db8a90fb..535536b1e0 100644 --- a/client/container_exec.go +++ b/client/container_exec.go @@ -1,10 +1,10 @@ package client // import "github.com/docker/docker/client" import ( + "context" "encoding/json" "github.com/docker/docker/api/types" - "golang.org/x/net/context" ) // ContainerExecCreate creates a new exec configuration to run an exec process. diff --git a/client/container_exec_test.go b/client/container_exec_test.go index 13cf889885..68b900bf14 100644 --- a/client/container_exec_test.go +++ b/client/container_exec_test.go @@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "encoding/json" "fmt" "io/ioutil" @@ -9,8 +10,6 @@ import ( "strings" "testing" - "golang.org/x/net/context" - "github.com/docker/docker/api/types" ) diff --git a/client/container_export.go b/client/container_export.go index f4c2bee368..d0c0a5cbad 100644 --- a/client/container_export.go +++ b/client/container_export.go @@ -1,10 +1,9 @@ package client // import "github.com/docker/docker/client" import ( + "context" "io" "net/url" - - "golang.org/x/net/context" ) // ContainerExport retrieves the raw contents of a container diff --git a/client/container_export_test.go b/client/container_export_test.go index 5d41a45e19..8f6c8dce64 100644 --- a/client/container_export_test.go +++ b/client/container_export_test.go @@ -2,13 +2,12 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "fmt" "io/ioutil" "net/http" "strings" "testing" - - "golang.org/x/net/context" ) func TestContainerExportError(t *testing.T) { diff --git a/client/container_inspect.go b/client/container_inspect.go index d1dbd47408..f453064cf8 100644 --- a/client/container_inspect.go +++ b/client/container_inspect.go @@ -2,12 +2,12 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "encoding/json" "io/ioutil" "net/url" "github.com/docker/docker/api/types" - "golang.org/x/net/context" ) // ContainerInspect returns the container information. diff --git a/client/container_inspect_test.go b/client/container_inspect_test.go index eeb903e450..92a77f6aea 100644 --- a/client/container_inspect_test.go +++ b/client/container_inspect_test.go @@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "encoding/json" "fmt" "io/ioutil" @@ -11,7 +12,6 @@ import ( "github.com/docker/docker/api/types" "github.com/pkg/errors" - "golang.org/x/net/context" ) func TestContainerInspectError(t *testing.T) { diff --git a/client/container_kill.go b/client/container_kill.go index c5a9fe75b2..4d6f1d23da 100644 --- a/client/container_kill.go +++ b/client/container_kill.go @@ -1,9 +1,8 @@ package client // import "github.com/docker/docker/client" import ( + "context" "net/url" - - "golang.org/x/net/context" ) // ContainerKill terminates the container process but does not remove the container from the docker host. diff --git a/client/container_kill_test.go b/client/container_kill_test.go index a4a1bfedf4..85bb5ee559 100644 --- a/client/container_kill_test.go +++ b/client/container_kill_test.go @@ -2,13 +2,12 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "fmt" "io/ioutil" "net/http" "strings" "testing" - - "golang.org/x/net/context" ) func TestContainerKillError(t *testing.T) { diff --git a/client/container_list.go b/client/container_list.go index cd2e13835b..9c218e2218 100644 --- a/client/container_list.go +++ b/client/container_list.go @@ -1,13 +1,13 @@ package client // import "github.com/docker/docker/client" import ( + "context" "encoding/json" "net/url" "strconv" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" - "golang.org/x/net/context" ) // ContainerList returns the list of containers in the docker host. diff --git a/client/container_list_test.go b/client/container_list_test.go index 5ca4c840da..809f20f5c7 100644 --- a/client/container_list_test.go +++ b/client/container_list_test.go @@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "encoding/json" "fmt" "io/ioutil" @@ -11,7 +12,6 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" - "golang.org/x/net/context" ) func TestContainerListError(t *testing.T) { diff --git a/client/container_logs.go b/client/container_logs.go index 01d88a322f..7c7fc9ea54 100644 --- a/client/container_logs.go +++ b/client/container_logs.go @@ -1,12 +1,11 @@ package client // import "github.com/docker/docker/client" import ( + "context" "io" "net/url" "time" - "golang.org/x/net/context" - "github.com/docker/docker/api/types" timetypes "github.com/docker/docker/api/types/time" ) diff --git a/client/container_logs_test.go b/client/container_logs_test.go index 2ad76df694..b1f5c8ddba 100644 --- a/client/container_logs_test.go +++ b/client/container_logs_test.go @@ -12,10 +12,10 @@ import ( "testing" "time" + "context" + "github.com/docker/docker/api/types" "github.com/docker/docker/internal/testutil" - - "golang.org/x/net/context" ) func TestContainerLogsNotFoundError(t *testing.T) { diff --git a/client/container_pause.go b/client/container_pause.go index fa0a9011a3..5e7271a371 100644 --- a/client/container_pause.go +++ b/client/container_pause.go @@ -1,6 +1,6 @@ package client // import "github.com/docker/docker/client" -import "golang.org/x/net/context" +import "context" // ContainerPause pauses the main process of a given container without terminating it. func (cli *Client) ContainerPause(ctx context.Context, containerID string) error { diff --git a/client/container_pause_test.go b/client/container_pause_test.go index ccf619c4d9..d1f73a67f3 100644 --- a/client/container_pause_test.go +++ b/client/container_pause_test.go @@ -2,13 +2,12 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "fmt" "io/ioutil" "net/http" "strings" "testing" - - "golang.org/x/net/context" ) func TestContainerPauseError(t *testing.T) { diff --git a/client/container_prune.go b/client/container_prune.go index 4129841d49..14f88d93ba 100644 --- a/client/container_prune.go +++ b/client/container_prune.go @@ -1,12 +1,12 @@ package client // import "github.com/docker/docker/client" import ( + "context" "encoding/json" "fmt" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" - "golang.org/x/net/context" ) // ContainersPrune requests the daemon to delete unused data diff --git a/client/container_prune_test.go b/client/container_prune_test.go index 7ffd9c7ecf..9efb7b5854 100644 --- a/client/container_prune_test.go +++ b/client/container_prune_test.go @@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "encoding/json" "fmt" "io/ioutil" @@ -13,7 +14,6 @@ import ( "github.com/docker/docker/api/types/filters" "github.com/gotestyourself/gotestyourself/assert" is "github.com/gotestyourself/gotestyourself/assert/cmp" - "golang.org/x/net/context" ) func TestContainersPruneError(t *testing.T) { diff --git a/client/container_remove.go b/client/container_remove.go index c782914319..ab4cfc16f8 100644 --- a/client/container_remove.go +++ b/client/container_remove.go @@ -1,10 +1,10 @@ package client // import "github.com/docker/docker/client" import ( + "context" "net/url" "github.com/docker/docker/api/types" - "golang.org/x/net/context" ) // ContainerRemove kills and removes a container from the docker host. diff --git a/client/container_remove_test.go b/client/container_remove_test.go index 537272cd1d..8a2d01b188 100644 --- a/client/container_remove_test.go +++ b/client/container_remove_test.go @@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "fmt" "io/ioutil" "net/http" @@ -11,7 +12,6 @@ import ( "github.com/docker/docker/api/types" "github.com/gotestyourself/gotestyourself/assert" is "github.com/gotestyourself/gotestyourself/assert/cmp" - "golang.org/x/net/context" ) func TestContainerRemoveError(t *testing.T) { diff --git a/client/container_rename.go b/client/container_rename.go index ad43e398d5..240fdf552b 100644 --- a/client/container_rename.go +++ b/client/container_rename.go @@ -1,9 +1,8 @@ package client // import "github.com/docker/docker/client" import ( + "context" "net/url" - - "golang.org/x/net/context" ) // ContainerRename changes the name of a given container. diff --git a/client/container_rename_test.go b/client/container_rename_test.go index 9b5ca7fbcb..42be609028 100644 --- a/client/container_rename_test.go +++ b/client/container_rename_test.go @@ -2,13 +2,12 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "fmt" "io/ioutil" "net/http" "strings" "testing" - - "golang.org/x/net/context" ) func TestContainerRenameError(t *testing.T) { diff --git a/client/container_resize.go b/client/container_resize.go index 8f1244e228..a9d4c0c79a 100644 --- a/client/container_resize.go +++ b/client/container_resize.go @@ -1,11 +1,11 @@ package client // import "github.com/docker/docker/client" import ( + "context" "net/url" "strconv" "github.com/docker/docker/api/types" - "golang.org/x/net/context" ) // ContainerResize changes the size of the tty for a container. diff --git a/client/container_resize_test.go b/client/container_resize_test.go index d5f4363cc7..3c10fd7e69 100644 --- a/client/container_resize_test.go +++ b/client/container_resize_test.go @@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "fmt" "io/ioutil" "net/http" @@ -9,7 +10,6 @@ import ( "testing" "github.com/docker/docker/api/types" - "golang.org/x/net/context" ) func TestContainerResizeError(t *testing.T) { diff --git a/client/container_restart.go b/client/container_restart.go index 8c8085dcf2..41e421969f 100644 --- a/client/container_restart.go +++ b/client/container_restart.go @@ -1,11 +1,11 @@ package client // import "github.com/docker/docker/client" import ( + "context" "net/url" "time" timetypes "github.com/docker/docker/api/types/time" - "golang.org/x/net/context" ) // ContainerRestart stops and starts a container again. diff --git a/client/container_restart_test.go b/client/container_restart_test.go index f20d9699f3..27e81da5d8 100644 --- a/client/container_restart_test.go +++ b/client/container_restart_test.go @@ -2,14 +2,13 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "fmt" "io/ioutil" "net/http" "strings" "testing" "time" - - "golang.org/x/net/context" ) func TestContainerRestartError(t *testing.T) { diff --git a/client/container_start.go b/client/container_start.go index d06b637003..c2e0b15dca 100644 --- a/client/container_start.go +++ b/client/container_start.go @@ -1,10 +1,9 @@ package client // import "github.com/docker/docker/client" import ( + "context" "net/url" - "golang.org/x/net/context" - "github.com/docker/docker/api/types" ) diff --git a/client/container_start_test.go b/client/container_start_test.go index 89018a808d..277c585caa 100644 --- a/client/container_start_test.go +++ b/client/container_start_test.go @@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "encoding/json" "fmt" "io/ioutil" @@ -9,8 +10,6 @@ import ( "strings" "testing" - "golang.org/x/net/context" - "github.com/docker/docker/api/types" ) diff --git a/client/container_stats.go b/client/container_stats.go index a7a2b8ec35..6ef44c7748 100644 --- a/client/container_stats.go +++ b/client/container_stats.go @@ -1,10 +1,10 @@ package client // import "github.com/docker/docker/client" import ( + "context" "net/url" "github.com/docker/docker/api/types" - "golang.org/x/net/context" ) // ContainerStats returns near realtime stats for a given container. diff --git a/client/container_stats_test.go b/client/container_stats_test.go index e16fcafb03..d88596315c 100644 --- a/client/container_stats_test.go +++ b/client/container_stats_test.go @@ -2,13 +2,12 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "fmt" "io/ioutil" "net/http" "strings" "testing" - - "golang.org/x/net/context" ) func TestContainerStatsError(t *testing.T) { diff --git a/client/container_stop.go b/client/container_stop.go index ca316666a9..5d7f1606ec 100644 --- a/client/container_stop.go +++ b/client/container_stop.go @@ -1,11 +1,11 @@ package client // import "github.com/docker/docker/client" import ( + "context" "net/url" "time" timetypes "github.com/docker/docker/api/types/time" - "golang.org/x/net/context" ) // ContainerStop stops a container without terminating the process. diff --git a/client/container_stop_test.go b/client/container_stop_test.go index 101625b0b4..e9af74525a 100644 --- a/client/container_stop_test.go +++ b/client/container_stop_test.go @@ -2,14 +2,13 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "fmt" "io/ioutil" "net/http" "strings" "testing" "time" - - "golang.org/x/net/context" ) func TestContainerStopError(t *testing.T) { diff --git a/client/container_top.go b/client/container_top.go index 55841ce998..9c9fce7a04 100644 --- a/client/container_top.go +++ b/client/container_top.go @@ -1,12 +1,12 @@ package client // import "github.com/docker/docker/client" import ( + "context" "encoding/json" "net/url" "strings" "github.com/docker/docker/api/types/container" - "golang.org/x/net/context" ) // ContainerTop shows process information from within a container. diff --git a/client/container_top_test.go b/client/container_top_test.go index 24f54613bf..48daba7783 100644 --- a/client/container_top_test.go +++ b/client/container_top_test.go @@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "encoding/json" "fmt" "io/ioutil" @@ -11,7 +12,6 @@ import ( "testing" "github.com/docker/docker/api/types/container" - "golang.org/x/net/context" ) func TestContainerTopError(t *testing.T) { diff --git a/client/container_unpause.go b/client/container_unpause.go index b75fb0c31e..1d8f873169 100644 --- a/client/container_unpause.go +++ b/client/container_unpause.go @@ -1,6 +1,6 @@ package client // import "github.com/docker/docker/client" -import "golang.org/x/net/context" +import "context" // ContainerUnpause resumes the process execution within a container func (cli *Client) ContainerUnpause(ctx context.Context, containerID string) error { diff --git a/client/container_unpause_test.go b/client/container_unpause_test.go index 0c7fe8cb77..000699190a 100644 --- a/client/container_unpause_test.go +++ b/client/container_unpause_test.go @@ -2,13 +2,12 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "fmt" "io/ioutil" "net/http" "strings" "testing" - - "golang.org/x/net/context" ) func TestContainerUnpauseError(t *testing.T) { diff --git a/client/container_update.go b/client/container_update.go index 218ec90fd9..14e7f23dfb 100644 --- a/client/container_update.go +++ b/client/container_update.go @@ -1,10 +1,10 @@ package client // import "github.com/docker/docker/client" import ( + "context" "encoding/json" "github.com/docker/docker/api/types/container" - "golang.org/x/net/context" ) // ContainerUpdate updates resources of a container diff --git a/client/container_update_test.go b/client/container_update_test.go index 9f7c951ce2..41c6485ec8 100644 --- a/client/container_update_test.go +++ b/client/container_update_test.go @@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "encoding/json" "fmt" "io/ioutil" @@ -10,7 +11,6 @@ import ( "testing" "github.com/docker/docker/api/types/container" - "golang.org/x/net/context" ) func TestContainerUpdateError(t *testing.T) { diff --git a/client/container_wait.go b/client/container_wait.go index 87b0dc1afd..6ab8c1da96 100644 --- a/client/container_wait.go +++ b/client/container_wait.go @@ -1,11 +1,10 @@ package client // import "github.com/docker/docker/client" import ( + "context" "encoding/json" "net/url" - "golang.org/x/net/context" - "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/versions" ) diff --git a/client/container_wait_test.go b/client/container_wait_test.go index e25abe6499..e18e1376f1 100644 --- a/client/container_wait_test.go +++ b/client/container_wait_test.go @@ -11,9 +11,9 @@ import ( "testing" "time" - "github.com/docker/docker/api/types/container" + "context" - "golang.org/x/net/context" + "github.com/docker/docker/api/types/container" ) func TestContainerWaitError(t *testing.T) { diff --git a/client/disk_usage.go b/client/disk_usage.go index 831fd40e62..8eb30eb5de 100644 --- a/client/disk_usage.go +++ b/client/disk_usage.go @@ -1,11 +1,11 @@ package client // import "github.com/docker/docker/client" import ( + "context" "encoding/json" "fmt" "github.com/docker/docker/api/types" - "golang.org/x/net/context" ) // DiskUsage requests the current data usage from the daemon diff --git a/client/disk_usage_test.go b/client/disk_usage_test.go index 615c1e6441..3968f75e62 100644 --- a/client/disk_usage_test.go +++ b/client/disk_usage_test.go @@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "encoding/json" "fmt" "io/ioutil" @@ -10,7 +11,6 @@ import ( "testing" "github.com/docker/docker/api/types" - "golang.org/x/net/context" ) func TestDiskUsageError(t *testing.T) { diff --git a/client/distribution_inspect.go b/client/distribution_inspect.go index 4644ea46f7..7245bbeeda 100644 --- a/client/distribution_inspect.go +++ b/client/distribution_inspect.go @@ -1,11 +1,11 @@ package client // import "github.com/docker/docker/client" import ( + "context" "encoding/json" "net/url" registrytypes "github.com/docker/docker/api/types/registry" - "golang.org/x/net/context" ) // DistributionInspect returns the image digest with full Manifest diff --git a/client/distribution_inspect_test.go b/client/distribution_inspect_test.go index d4124bfa15..d3c6828df1 100644 --- a/client/distribution_inspect_test.go +++ b/client/distribution_inspect_test.go @@ -1,13 +1,13 @@ package client // import "github.com/docker/docker/client" import ( + "context" "net/http" "testing" "github.com/gotestyourself/gotestyourself/assert" is "github.com/gotestyourself/gotestyourself/assert/cmp" "github.com/pkg/errors" - "golang.org/x/net/context" ) func TestDistributionInspectUnsupported(t *testing.T) { diff --git a/client/events.go b/client/events.go index d5d4dd8ac2..6e56538955 100644 --- a/client/events.go +++ b/client/events.go @@ -1,12 +1,11 @@ package client // import "github.com/docker/docker/client" import ( + "context" "encoding/json" "net/url" "time" - "golang.org/x/net/context" - "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/events" "github.com/docker/docker/api/types/filters" diff --git a/client/events_test.go b/client/events_test.go index 5ea6091359..4a39901b45 100644 --- a/client/events_test.go +++ b/client/events_test.go @@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "encoding/json" "fmt" "io" @@ -10,8 +11,6 @@ import ( "strings" "testing" - "golang.org/x/net/context" - "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/events" "github.com/docker/docker/api/types/filters" diff --git a/client/hijack.go b/client/hijack.go index dab3a75691..2b14831fd2 100644 --- a/client/hijack.go +++ b/client/hijack.go @@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client" import ( "bufio" + "context" "crypto/tls" "fmt" "net" @@ -14,7 +15,6 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/go-connections/sockets" "github.com/pkg/errors" - "golang.org/x/net/context" ) // tlsClientCon holds tls information and a dialed connection. diff --git a/client/image_build.go b/client/image_build.go index 97c9301c82..6721460316 100644 --- a/client/image_build.go +++ b/client/image_build.go @@ -1,6 +1,7 @@ package client // import "github.com/docker/docker/client" import ( + "context" "encoding/base64" "encoding/json" "io" @@ -9,8 +10,6 @@ import ( "strconv" "strings" - "golang.org/x/net/context" - "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/container" ) diff --git a/client/image_build_test.go b/client/image_build_test.go index ef329cefc0..95c11bc3e5 100644 --- a/client/image_build_test.go +++ b/client/image_build_test.go @@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "fmt" "io/ioutil" "net/http" @@ -9,8 +10,6 @@ import ( "strings" "testing" - "golang.org/x/net/context" - "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/container" "github.com/docker/go-units" diff --git a/client/image_create.go b/client/image_create.go index fe237508b1..239380474e 100644 --- a/client/image_create.go +++ b/client/image_create.go @@ -1,12 +1,11 @@ package client // import "github.com/docker/docker/client" import ( + "context" "io" "net/url" "strings" - "golang.org/x/net/context" - "github.com/docker/distribution/reference" "github.com/docker/docker/api/types" ) diff --git a/client/image_create_test.go b/client/image_create_test.go index aa1d273483..b89f16d27b 100644 --- a/client/image_create_test.go +++ b/client/image_create_test.go @@ -2,14 +2,13 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "fmt" "io/ioutil" "net/http" "strings" "testing" - "golang.org/x/net/context" - "github.com/docker/docker/api/types" ) diff --git a/client/image_history.go b/client/image_history.go index cf74723a03..0151b9517f 100644 --- a/client/image_history.go +++ b/client/image_history.go @@ -1,11 +1,11 @@ package client // import "github.com/docker/docker/client" import ( + "context" "encoding/json" "net/url" "github.com/docker/docker/api/types/image" - "golang.org/x/net/context" ) // ImageHistory returns the changes in an image in history format. diff --git a/client/image_history_test.go b/client/image_history_test.go index 6b2eca214d..0217bf575a 100644 --- a/client/image_history_test.go +++ b/client/image_history_test.go @@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "encoding/json" "fmt" "io/ioutil" @@ -10,7 +11,6 @@ import ( "testing" "github.com/docker/docker/api/types/image" - "golang.org/x/net/context" ) func TestImageHistoryError(t *testing.T) { diff --git a/client/image_import.go b/client/image_import.go index dddbf9c629..c2972ea950 100644 --- a/client/image_import.go +++ b/client/image_import.go @@ -1,12 +1,11 @@ package client // import "github.com/docker/docker/client" import ( + "context" "io" "net/url" "strings" - "golang.org/x/net/context" - "github.com/docker/distribution/reference" "github.com/docker/docker/api/types" ) diff --git a/client/image_import_test.go b/client/image_import_test.go index 5f304c1af1..944cd52fec 100644 --- a/client/image_import_test.go +++ b/client/image_import_test.go @@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "fmt" "io/ioutil" "net/http" @@ -10,7 +11,6 @@ import ( "testing" "github.com/docker/docker/api/types" - "golang.org/x/net/context" ) func TestImageImportError(t *testing.T) { diff --git a/client/image_inspect.go b/client/image_inspect.go index 1581133254..2f8f6d2f14 100644 --- a/client/image_inspect.go +++ b/client/image_inspect.go @@ -2,11 +2,11 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "encoding/json" "io/ioutil" "github.com/docker/docker/api/types" - "golang.org/x/net/context" ) // ImageInspectWithRaw returns the image information and its raw representation. diff --git a/client/image_inspect_test.go b/client/image_inspect_test.go index e42d251f51..a910872d1c 100644 --- a/client/image_inspect_test.go +++ b/client/image_inspect_test.go @@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "encoding/json" "fmt" "io/ioutil" @@ -12,7 +13,6 @@ import ( "github.com/docker/docker/api/types" "github.com/pkg/errors" - "golang.org/x/net/context" ) func TestImageInspectError(t *testing.T) { diff --git a/client/image_list.go b/client/image_list.go index 1e84a962da..32fae27b37 100644 --- a/client/image_list.go +++ b/client/image_list.go @@ -1,13 +1,13 @@ package client // import "github.com/docker/docker/client" import ( + "context" "encoding/json" "net/url" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/versions" - "golang.org/x/net/context" ) // ImageList returns a list of images in the docker host. diff --git a/client/image_list_test.go b/client/image_list_test.go index 48e10fa105..3ba5239a53 100644 --- a/client/image_list_test.go +++ b/client/image_list_test.go @@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "encoding/json" "fmt" "io/ioutil" @@ -11,7 +12,6 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" - "golang.org/x/net/context" ) func TestImageListError(t *testing.T) { diff --git a/client/image_load.go b/client/image_load.go index 411567c0c9..91016e493c 100644 --- a/client/image_load.go +++ b/client/image_load.go @@ -1,11 +1,10 @@ package client // import "github.com/docker/docker/client" import ( + "context" "io" "net/url" - "golang.org/x/net/context" - "github.com/docker/docker/api/types" ) diff --git a/client/image_load_test.go b/client/image_load_test.go index 63809fb0f0..116317da75 100644 --- a/client/image_load_test.go +++ b/client/image_load_test.go @@ -2,13 +2,12 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "fmt" "io/ioutil" "net/http" "strings" "testing" - - "golang.org/x/net/context" ) func TestImageLoadError(t *testing.T) { diff --git a/client/image_prune.go b/client/image_prune.go index 32ea9098c3..78ee3f6c49 100644 --- a/client/image_prune.go +++ b/client/image_prune.go @@ -1,12 +1,12 @@ package client // import "github.com/docker/docker/client" import ( + "context" "encoding/json" "fmt" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" - "golang.org/x/net/context" ) // ImagesPrune requests the daemon to delete unused data diff --git a/client/image_prune_test.go b/client/image_prune_test.go index 9b161531f2..3de3226f83 100644 --- a/client/image_prune_test.go +++ b/client/image_prune_test.go @@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "encoding/json" "fmt" "io/ioutil" @@ -13,7 +14,6 @@ import ( "github.com/docker/docker/api/types/filters" "github.com/gotestyourself/gotestyourself/assert" is "github.com/gotestyourself/gotestyourself/assert/cmp" - "golang.org/x/net/context" ) func TestImagesPruneError(t *testing.T) { diff --git a/client/image_pull.go b/client/image_pull.go index ee5923a8f6..d97aacf8c5 100644 --- a/client/image_pull.go +++ b/client/image_pull.go @@ -1,13 +1,12 @@ package client // import "github.com/docker/docker/client" import ( + "context" "io" "net/http" "net/url" "strings" - "golang.org/x/net/context" - "github.com/docker/distribution/reference" "github.com/docker/docker/api/types" ) diff --git a/client/image_pull_test.go b/client/image_pull_test.go index f23c131afd..361c5c2be3 100644 --- a/client/image_pull_test.go +++ b/client/image_pull_test.go @@ -2,14 +2,13 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "fmt" "io/ioutil" "net/http" "strings" "testing" - "golang.org/x/net/context" - "github.com/docker/docker/api/types" ) diff --git a/client/image_push.go b/client/image_push.go index 6fcc1626ec..a15871c2b4 100644 --- a/client/image_push.go +++ b/client/image_push.go @@ -1,13 +1,12 @@ package client // import "github.com/docker/docker/client" import ( + "context" "errors" "io" "net/http" "net/url" - "golang.org/x/net/context" - "github.com/docker/distribution/reference" "github.com/docker/docker/api/types" ) diff --git a/client/image_push_test.go b/client/image_push_test.go index b006d4f3dc..0693601af1 100644 --- a/client/image_push_test.go +++ b/client/image_push_test.go @@ -2,14 +2,13 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "fmt" "io/ioutil" "net/http" "strings" "testing" - "golang.org/x/net/context" - "github.com/docker/docker/api/types" ) diff --git a/client/image_remove.go b/client/image_remove.go index 6d222a5077..45d6e6f0db 100644 --- a/client/image_remove.go +++ b/client/image_remove.go @@ -1,11 +1,11 @@ package client // import "github.com/docker/docker/client" import ( + "context" "encoding/json" "net/url" "github.com/docker/docker/api/types" - "golang.org/x/net/context" ) // ImageRemove removes an image from the docker host. diff --git a/client/image_remove_test.go b/client/image_remove_test.go index a1686e6496..274d450ac4 100644 --- a/client/image_remove_test.go +++ b/client/image_remove_test.go @@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "encoding/json" "fmt" "io/ioutil" @@ -12,7 +13,6 @@ import ( "github.com/docker/docker/api/types" "github.com/gotestyourself/gotestyourself/assert" is "github.com/gotestyourself/gotestyourself/assert/cmp" - "golang.org/x/net/context" ) func TestImageRemoveError(t *testing.T) { diff --git a/client/image_save.go b/client/image_save.go index a919615966..d1314e4b22 100644 --- a/client/image_save.go +++ b/client/image_save.go @@ -1,10 +1,9 @@ package client // import "github.com/docker/docker/client" import ( + "context" "io" "net/url" - - "golang.org/x/net/context" ) // ImageSave retrieves one or more images from the docker host as an io.ReadCloser. diff --git a/client/image_save_test.go b/client/image_save_test.go index bf9d643cb9..f79efc654d 100644 --- a/client/image_save_test.go +++ b/client/image_save_test.go @@ -2,14 +2,13 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "fmt" "io/ioutil" "net/http" "reflect" "testing" - "golang.org/x/net/context" - "strings" ) diff --git a/client/image_search.go b/client/image_search.go index ba5072ad59..176de3c582 100644 --- a/client/image_search.go +++ b/client/image_search.go @@ -1,6 +1,7 @@ package client // import "github.com/docker/docker/client" import ( + "context" "encoding/json" "fmt" "net/http" @@ -9,7 +10,6 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/registry" - "golang.org/x/net/context" ) // ImageSearch makes the docker host to search by a term in a remote registry. diff --git a/client/image_search_test.go b/client/image_search_test.go index d4f9fff15f..1456cd606f 100644 --- a/client/image_search_test.go +++ b/client/image_search_test.go @@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "encoding/json" "fmt" "io/ioutil" @@ -12,7 +13,6 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/registry" - "golang.org/x/net/context" ) func TestImageSearchAnyError(t *testing.T) { diff --git a/client/image_tag.go b/client/image_tag.go index 4399a3e9aa..5652bfc252 100644 --- a/client/image_tag.go +++ b/client/image_tag.go @@ -1,11 +1,11 @@ package client // import "github.com/docker/docker/client" import ( + "context" "net/url" "github.com/docker/distribution/reference" "github.com/pkg/errors" - "golang.org/x/net/context" ) // ImageTag tags an image in the docker host diff --git a/client/image_tag_test.go b/client/image_tag_test.go index b8660c929b..2923bb995b 100644 --- a/client/image_tag_test.go +++ b/client/image_tag_test.go @@ -2,13 +2,12 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "fmt" "io/ioutil" "net/http" "strings" "testing" - - "golang.org/x/net/context" ) func TestImageTagError(t *testing.T) { diff --git a/client/info.go b/client/info.go index 3f6746c942..121f256ab1 100644 --- a/client/info.go +++ b/client/info.go @@ -1,12 +1,12 @@ package client // import "github.com/docker/docker/client" import ( + "context" "encoding/json" "fmt" "net/url" "github.com/docker/docker/api/types" - "golang.org/x/net/context" ) // Info returns information about the docker server. diff --git a/client/info_test.go b/client/info_test.go index de06ef7a68..866d8e8849 100644 --- a/client/info_test.go +++ b/client/info_test.go @@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "encoding/json" "fmt" "io/ioutil" @@ -10,7 +11,6 @@ import ( "testing" "github.com/docker/docker/api/types" - "golang.org/x/net/context" ) func TestInfoServerError(t *testing.T) { diff --git a/client/interface.go b/client/interface.go index 8517546abd..314c940c3b 100644 --- a/client/interface.go +++ b/client/interface.go @@ -1,6 +1,7 @@ package client // import "github.com/docker/docker/client" import ( + "context" "io" "net" "time" @@ -14,7 +15,6 @@ import ( "github.com/docker/docker/api/types/registry" "github.com/docker/docker/api/types/swarm" volumetypes "github.com/docker/docker/api/types/volume" - "golang.org/x/net/context" ) // CommonAPIClient is the common methods between stable and experimental versions of APIClient. diff --git a/client/interface_experimental.go b/client/interface_experimental.go index 236c1d6ca6..402ffb512c 100644 --- a/client/interface_experimental.go +++ b/client/interface_experimental.go @@ -1,8 +1,9 @@ package client // import "github.com/docker/docker/client" import ( + "context" + "github.com/docker/docker/api/types" - "golang.org/x/net/context" ) type apiClientExperimental interface { diff --git a/client/login.go b/client/login.go index fefb101ade..7d66181900 100644 --- a/client/login.go +++ b/client/login.go @@ -1,13 +1,13 @@ package client // import "github.com/docker/docker/client" import ( + "context" "encoding/json" "net/http" "net/url" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/registry" - "golang.org/x/net/context" ) // RegistryLogin authenticates the docker server with a given docker registry. diff --git a/client/network_connect.go b/client/network_connect.go index af4a61659b..5718946134 100644 --- a/client/network_connect.go +++ b/client/network_connect.go @@ -1,9 +1,10 @@ package client // import "github.com/docker/docker/client" import ( + "context" + "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/network" - "golang.org/x/net/context" ) // NetworkConnect connects a container to an existent network in the docker host. diff --git a/client/network_connect_test.go b/client/network_connect_test.go index 28b1c0069c..07a3ba692e 100644 --- a/client/network_connect_test.go +++ b/client/network_connect_test.go @@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "encoding/json" "fmt" "io/ioutil" @@ -9,8 +10,6 @@ import ( "strings" "testing" - "golang.org/x/net/context" - "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/network" ) diff --git a/client/network_create.go b/client/network_create.go index fa1d301a4c..41da2ac610 100644 --- a/client/network_create.go +++ b/client/network_create.go @@ -1,10 +1,10 @@ package client // import "github.com/docker/docker/client" import ( + "context" "encoding/json" "github.com/docker/docker/api/types" - "golang.org/x/net/context" ) // NetworkCreate creates a new network in the docker host. diff --git a/client/network_create_test.go b/client/network_create_test.go index eea5109ee5..894c98ebb3 100644 --- a/client/network_create_test.go +++ b/client/network_create_test.go @@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "encoding/json" "fmt" "io/ioutil" @@ -10,7 +11,6 @@ import ( "testing" "github.com/docker/docker/api/types" - "golang.org/x/net/context" ) func TestNetworkCreateError(t *testing.T) { diff --git a/client/network_disconnect.go b/client/network_disconnect.go index 5fc75a9412..dd15676656 100644 --- a/client/network_disconnect.go +++ b/client/network_disconnect.go @@ -1,8 +1,9 @@ package client // import "github.com/docker/docker/client" import ( + "context" + "github.com/docker/docker/api/types" - "golang.org/x/net/context" ) // NetworkDisconnect disconnects a container from an existent network in the docker host. diff --git a/client/network_disconnect_test.go b/client/network_disconnect_test.go index e092ccf20e..b27b955e2e 100644 --- a/client/network_disconnect_test.go +++ b/client/network_disconnect_test.go @@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "encoding/json" "fmt" "io/ioutil" @@ -10,7 +11,6 @@ import ( "testing" "github.com/docker/docker/api/types" - "golang.org/x/net/context" ) func TestNetworkDisconnectError(t *testing.T) { diff --git a/client/network_inspect.go b/client/network_inspect.go index 0e18caf1b1..025f6d8757 100644 --- a/client/network_inspect.go +++ b/client/network_inspect.go @@ -2,12 +2,12 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "encoding/json" "io/ioutil" "net/url" "github.com/docker/docker/api/types" - "golang.org/x/net/context" ) // NetworkInspect returns the information for a specific network configured in the docker host. diff --git a/client/network_inspect_test.go b/client/network_inspect_test.go index 8778021ed9..4f4919e305 100644 --- a/client/network_inspect_test.go +++ b/client/network_inspect_test.go @@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "encoding/json" "fmt" "io/ioutil" @@ -14,7 +15,6 @@ import ( "github.com/gotestyourself/gotestyourself/assert" is "github.com/gotestyourself/gotestyourself/assert/cmp" "github.com/pkg/errors" - "golang.org/x/net/context" ) func TestNetworkInspectError(t *testing.T) { diff --git a/client/network_list.go b/client/network_list.go index 9b424285eb..f16b2f5624 100644 --- a/client/network_list.go +++ b/client/network_list.go @@ -1,12 +1,12 @@ package client // import "github.com/docker/docker/client" import ( + "context" "encoding/json" "net/url" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" - "golang.org/x/net/context" ) // NetworkList returns the list of networks configured in the docker host. diff --git a/client/network_list_test.go b/client/network_list_test.go index 2604894cd1..5263808cfd 100644 --- a/client/network_list_test.go +++ b/client/network_list_test.go @@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "encoding/json" "fmt" "io/ioutil" @@ -11,7 +12,6 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" - "golang.org/x/net/context" ) func TestNetworkListError(t *testing.T) { diff --git a/client/network_prune.go b/client/network_prune.go index d546f0c304..6418b8b607 100644 --- a/client/network_prune.go +++ b/client/network_prune.go @@ -1,12 +1,12 @@ package client // import "github.com/docker/docker/client" import ( + "context" "encoding/json" "fmt" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" - "golang.org/x/net/context" ) // NetworksPrune requests the daemon to delete unused networks diff --git a/client/network_prune_test.go b/client/network_prune_test.go index 85908f0cf3..f67b6ab4d3 100644 --- a/client/network_prune_test.go +++ b/client/network_prune_test.go @@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "encoding/json" "fmt" "io/ioutil" @@ -13,7 +14,6 @@ import ( "github.com/docker/docker/api/types/filters" "github.com/gotestyourself/gotestyourself/assert" is "github.com/gotestyourself/gotestyourself/assert/cmp" - "golang.org/x/net/context" ) func TestNetworksPruneError(t *testing.T) { diff --git a/client/network_remove.go b/client/network_remove.go index c99de10c83..12741437be 100644 --- a/client/network_remove.go +++ b/client/network_remove.go @@ -1,6 +1,6 @@ package client // import "github.com/docker/docker/client" -import "golang.org/x/net/context" +import "context" // NetworkRemove removes an existent network from the docker host. func (cli *Client) NetworkRemove(ctx context.Context, networkID string) error { diff --git a/client/network_remove_test.go b/client/network_remove_test.go index c8c9101591..ac40af74e6 100644 --- a/client/network_remove_test.go +++ b/client/network_remove_test.go @@ -2,13 +2,12 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "fmt" "io/ioutil" "net/http" "strings" "testing" - - "golang.org/x/net/context" ) func TestNetworkRemoveError(t *testing.T) { diff --git a/client/node_inspect.go b/client/node_inspect.go index 7c0c1d473e..593b2e9f0b 100644 --- a/client/node_inspect.go +++ b/client/node_inspect.go @@ -2,11 +2,11 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "encoding/json" "io/ioutil" "github.com/docker/docker/api/types/swarm" - "golang.org/x/net/context" ) // NodeInspectWithRaw returns the node information. diff --git a/client/node_inspect_test.go b/client/node_inspect_test.go index efda287771..d0fdace7fe 100644 --- a/client/node_inspect_test.go +++ b/client/node_inspect_test.go @@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "encoding/json" "fmt" "io/ioutil" @@ -11,7 +12,6 @@ import ( "github.com/docker/docker/api/types/swarm" "github.com/pkg/errors" - "golang.org/x/net/context" ) func TestNodeInspectError(t *testing.T) { diff --git a/client/node_list.go b/client/node_list.go index c613ad2197..9883f6fc52 100644 --- a/client/node_list.go +++ b/client/node_list.go @@ -1,13 +1,13 @@ package client // import "github.com/docker/docker/client" import ( + "context" "encoding/json" "net/url" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/swarm" - "golang.org/x/net/context" ) // NodeList returns the list of nodes. diff --git a/client/node_list_test.go b/client/node_list_test.go index d227d98f9a..784a754a59 100644 --- a/client/node_list_test.go +++ b/client/node_list_test.go @@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "encoding/json" "fmt" "io/ioutil" @@ -12,7 +13,6 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/swarm" - "golang.org/x/net/context" ) func TestNodeListError(t *testing.T) { diff --git a/client/node_remove.go b/client/node_remove.go index 7c1a757d31..c07fc0eb39 100644 --- a/client/node_remove.go +++ b/client/node_remove.go @@ -3,9 +3,9 @@ package client // import "github.com/docker/docker/client" import ( "net/url" - "github.com/docker/docker/api/types" + "context" - "golang.org/x/net/context" + "github.com/docker/docker/api/types" ) // NodeRemove removes a Node. diff --git a/client/node_remove_test.go b/client/node_remove_test.go index f2921d882b..d30e718db1 100644 --- a/client/node_remove_test.go +++ b/client/node_remove_test.go @@ -8,9 +8,9 @@ import ( "strings" "testing" - "github.com/docker/docker/api/types" + "context" - "golang.org/x/net/context" + "github.com/docker/docker/api/types" ) func TestNodeRemoveError(t *testing.T) { diff --git a/client/node_update.go b/client/node_update.go index 0b528a4703..de32a617fb 100644 --- a/client/node_update.go +++ b/client/node_update.go @@ -1,11 +1,11 @@ package client // import "github.com/docker/docker/client" import ( + "context" "net/url" "strconv" "github.com/docker/docker/api/types/swarm" - "golang.org/x/net/context" ) // NodeUpdate updates a Node. diff --git a/client/node_update_test.go b/client/node_update_test.go index f4db3ae057..d89e1ed858 100644 --- a/client/node_update_test.go +++ b/client/node_update_test.go @@ -2,14 +2,13 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "fmt" "io/ioutil" "net/http" "strings" "testing" - "golang.org/x/net/context" - "github.com/docker/docker/api/types/swarm" ) diff --git a/client/ping.go b/client/ping.go index e2366276da..85d38adb51 100644 --- a/client/ping.go +++ b/client/ping.go @@ -1,10 +1,10 @@ package client // import "github.com/docker/docker/client" import ( + "context" "path" "github.com/docker/docker/api/types" - "golang.org/x/net/context" ) // Ping pings the server and returns the value of the "Docker-Experimental", "OS-Type" & "API-Version" headers diff --git a/client/ping_test.go b/client/ping_test.go index f83233aceb..785dfc00fb 100644 --- a/client/ping_test.go +++ b/client/ping_test.go @@ -1,6 +1,7 @@ package client // import "github.com/docker/docker/client" import ( + "context" "errors" "io/ioutil" "net/http" @@ -9,7 +10,6 @@ import ( "github.com/gotestyourself/gotestyourself/assert" is "github.com/gotestyourself/gotestyourself/assert/cmp" - "golang.org/x/net/context" ) // TestPingFail tests that when a server sends a non-successful response that we diff --git a/client/plugin_create.go b/client/plugin_create.go index 51ef9c9945..4591db50fd 100644 --- a/client/plugin_create.go +++ b/client/plugin_create.go @@ -1,12 +1,12 @@ package client // import "github.com/docker/docker/client" import ( + "context" "io" "net/http" "net/url" "github.com/docker/docker/api/types" - "golang.org/x/net/context" ) // PluginCreate creates a plugin diff --git a/client/plugin_disable.go b/client/plugin_disable.go index 8d8c41d226..01f6574f95 100644 --- a/client/plugin_disable.go +++ b/client/plugin_disable.go @@ -1,10 +1,10 @@ package client // import "github.com/docker/docker/client" import ( + "context" "net/url" "github.com/docker/docker/api/types" - "golang.org/x/net/context" ) // PluginDisable disables a plugin diff --git a/client/plugin_disable_test.go b/client/plugin_disable_test.go index 104c6f8808..ac2413d6c5 100644 --- a/client/plugin_disable_test.go +++ b/client/plugin_disable_test.go @@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "fmt" "io/ioutil" "net/http" @@ -9,7 +10,6 @@ import ( "testing" "github.com/docker/docker/api/types" - "golang.org/x/net/context" ) func TestPluginDisableError(t *testing.T) { diff --git a/client/plugin_enable.go b/client/plugin_enable.go index 1f0f8f7340..736da48bd1 100644 --- a/client/plugin_enable.go +++ b/client/plugin_enable.go @@ -1,11 +1,11 @@ package client // import "github.com/docker/docker/client" import ( + "context" "net/url" "strconv" "github.com/docker/docker/api/types" - "golang.org/x/net/context" ) // PluginEnable enables a plugin diff --git a/client/plugin_enable_test.go b/client/plugin_enable_test.go index 64bb23877f..911ccaf1e9 100644 --- a/client/plugin_enable_test.go +++ b/client/plugin_enable_test.go @@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "fmt" "io/ioutil" "net/http" @@ -9,7 +10,6 @@ import ( "testing" "github.com/docker/docker/api/types" - "golang.org/x/net/context" ) func TestPluginEnableError(t *testing.T) { diff --git a/client/plugin_inspect.go b/client/plugin_inspect.go index 983b1090c1..0ab7beaee8 100644 --- a/client/plugin_inspect.go +++ b/client/plugin_inspect.go @@ -2,11 +2,11 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "encoding/json" "io/ioutil" "github.com/docker/docker/api/types" - "golang.org/x/net/context" ) // PluginInspectWithRaw inspects an existing plugin diff --git a/client/plugin_inspect_test.go b/client/plugin_inspect_test.go index eada16dbb8..74ca0f0fc0 100644 --- a/client/plugin_inspect_test.go +++ b/client/plugin_inspect_test.go @@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "encoding/json" "fmt" "io/ioutil" @@ -11,7 +12,6 @@ import ( "github.com/docker/docker/api/types" "github.com/pkg/errors" - "golang.org/x/net/context" ) func TestPluginInspectError(t *testing.T) { diff --git a/client/plugin_install.go b/client/plugin_install.go index ae04387d5d..13baa40a9b 100644 --- a/client/plugin_install.go +++ b/client/plugin_install.go @@ -1,6 +1,7 @@ package client // import "github.com/docker/docker/client" import ( + "context" "encoding/json" "io" "net/http" @@ -9,7 +10,6 @@ import ( "github.com/docker/distribution/reference" "github.com/docker/docker/api/types" "github.com/pkg/errors" - "golang.org/x/net/context" ) // PluginInstall installs a plugin diff --git a/client/plugin_list.go b/client/plugin_list.go index e49876621d..ade1051a97 100644 --- a/client/plugin_list.go +++ b/client/plugin_list.go @@ -1,12 +1,12 @@ package client // import "github.com/docker/docker/client" import ( + "context" "encoding/json" "net/url" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" - "golang.org/x/net/context" ) // PluginList returns the installed plugins diff --git a/client/plugin_list_test.go b/client/plugin_list_test.go index bad5dd1381..7dc351dceb 100644 --- a/client/plugin_list_test.go +++ b/client/plugin_list_test.go @@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "encoding/json" "fmt" "io/ioutil" @@ -11,7 +12,6 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" - "golang.org/x/net/context" ) func TestPluginListError(t *testing.T) { diff --git a/client/plugin_push.go b/client/plugin_push.go index 33b38d843c..d20bfe8447 100644 --- a/client/plugin_push.go +++ b/client/plugin_push.go @@ -1,9 +1,8 @@ package client // import "github.com/docker/docker/client" import ( + "context" "io" - - "golang.org/x/net/context" ) // PluginPush pushes a plugin to a registry diff --git a/client/plugin_push_test.go b/client/plugin_push_test.go index 8c5a4508db..20b23a1173 100644 --- a/client/plugin_push_test.go +++ b/client/plugin_push_test.go @@ -2,13 +2,12 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "fmt" "io/ioutil" "net/http" "strings" "testing" - - "golang.org/x/net/context" ) func TestPluginPushError(t *testing.T) { diff --git a/client/plugin_remove.go b/client/plugin_remove.go index b9e7d8e4a8..8563bab0db 100644 --- a/client/plugin_remove.go +++ b/client/plugin_remove.go @@ -1,10 +1,10 @@ package client // import "github.com/docker/docker/client" import ( + "context" "net/url" "github.com/docker/docker/api/types" - "golang.org/x/net/context" ) // PluginRemove removes a plugin diff --git a/client/plugin_remove_test.go b/client/plugin_remove_test.go index adcc3c12de..a037ae2a13 100644 --- a/client/plugin_remove_test.go +++ b/client/plugin_remove_test.go @@ -8,9 +8,9 @@ import ( "strings" "testing" - "github.com/docker/docker/api/types" + "context" - "golang.org/x/net/context" + "github.com/docker/docker/api/types" ) func TestPluginRemoveError(t *testing.T) { diff --git a/client/plugin_set.go b/client/plugin_set.go index de72cc0d3a..dcf5752ca2 100644 --- a/client/plugin_set.go +++ b/client/plugin_set.go @@ -1,7 +1,7 @@ package client // import "github.com/docker/docker/client" import ( - "golang.org/x/net/context" + "context" ) // PluginSet modifies settings for an existing plugin diff --git a/client/plugin_set_test.go b/client/plugin_set_test.go index de2cc43140..2e97904b86 100644 --- a/client/plugin_set_test.go +++ b/client/plugin_set_test.go @@ -2,13 +2,12 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "fmt" "io/ioutil" "net/http" "strings" "testing" - - "golang.org/x/net/context" ) func TestPluginSetError(t *testing.T) { diff --git a/client/plugin_upgrade.go b/client/plugin_upgrade.go index 33b740ca76..115cea945b 100644 --- a/client/plugin_upgrade.go +++ b/client/plugin_upgrade.go @@ -1,13 +1,13 @@ package client // import "github.com/docker/docker/client" import ( + "context" "io" "net/url" "github.com/docker/distribution/reference" "github.com/docker/docker/api/types" "github.com/pkg/errors" - "golang.org/x/net/context" ) // PluginUpgrade upgrades a plugin diff --git a/client/request.go b/client/request.go index 302f599f5c..a19d62aa52 100644 --- a/client/request.go +++ b/client/request.go @@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "encoding/json" "fmt" "io" @@ -15,7 +16,6 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/versions" "github.com/pkg/errors" - "golang.org/x/net/context" "golang.org/x/net/context/ctxhttp" ) diff --git a/client/request_test.go b/client/request_test.go index 1a0a87e2f4..704a122c08 100644 --- a/client/request_test.go +++ b/client/request_test.go @@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "fmt" "io/ioutil" "net/http" @@ -10,7 +11,6 @@ import ( "github.com/docker/docker/api/types" "github.com/gotestyourself/gotestyourself/assert" - "golang.org/x/net/context" ) // TestSetHostHeader should set fake host for local communications, set real host diff --git a/client/secret_create.go b/client/secret_create.go index fa639caf5b..09fae82f2a 100644 --- a/client/secret_create.go +++ b/client/secret_create.go @@ -1,11 +1,11 @@ package client // import "github.com/docker/docker/client" import ( + "context" "encoding/json" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/swarm" - "golang.org/x/net/context" ) // SecretCreate creates a new Secret. diff --git a/client/secret_create_test.go b/client/secret_create_test.go index b31cab509f..83f99cd09c 100644 --- a/client/secret_create_test.go +++ b/client/secret_create_test.go @@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "encoding/json" "fmt" "io/ioutil" @@ -13,7 +14,6 @@ import ( "github.com/docker/docker/api/types/swarm" "github.com/gotestyourself/gotestyourself/assert" is "github.com/gotestyourself/gotestyourself/assert/cmp" - "golang.org/x/net/context" ) func TestSecretCreateUnsupported(t *testing.T) { diff --git a/client/secret_inspect.go b/client/secret_inspect.go index 9342e3bc07..e8322f4589 100644 --- a/client/secret_inspect.go +++ b/client/secret_inspect.go @@ -2,11 +2,11 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "encoding/json" "io/ioutil" "github.com/docker/docker/api/types/swarm" - "golang.org/x/net/context" ) // SecretInspectWithRaw returns the secret information with raw data diff --git a/client/secret_inspect_test.go b/client/secret_inspect_test.go index 0bb3ae24cc..75782324a2 100644 --- a/client/secret_inspect_test.go +++ b/client/secret_inspect_test.go @@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "encoding/json" "fmt" "io/ioutil" @@ -13,7 +14,6 @@ import ( "github.com/gotestyourself/gotestyourself/assert" is "github.com/gotestyourself/gotestyourself/assert/cmp" "github.com/pkg/errors" - "golang.org/x/net/context" ) func TestSecretInspectUnsupported(t *testing.T) { diff --git a/client/secret_list.go b/client/secret_list.go index adf4d92be2..f6bf7ba470 100644 --- a/client/secret_list.go +++ b/client/secret_list.go @@ -1,13 +1,13 @@ package client // import "github.com/docker/docker/client" import ( + "context" "encoding/json" "net/url" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/swarm" - "golang.org/x/net/context" ) // SecretList returns the list of secrets. diff --git a/client/secret_list_test.go b/client/secret_list_test.go index 36d8e8e2f0..4fc3235f3d 100644 --- a/client/secret_list_test.go +++ b/client/secret_list_test.go @@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "encoding/json" "fmt" "io/ioutil" @@ -14,7 +15,6 @@ import ( "github.com/docker/docker/api/types/swarm" "github.com/gotestyourself/gotestyourself/assert" is "github.com/gotestyourself/gotestyourself/assert/cmp" - "golang.org/x/net/context" ) func TestSecretListUnsupported(t *testing.T) { diff --git a/client/secret_remove.go b/client/secret_remove.go index 89326e0908..e9d5218293 100644 --- a/client/secret_remove.go +++ b/client/secret_remove.go @@ -1,6 +1,6 @@ package client // import "github.com/docker/docker/client" -import "golang.org/x/net/context" +import "context" // SecretRemove removes a Secret. func (cli *Client) SecretRemove(ctx context.Context, id string) error { diff --git a/client/secret_remove_test.go b/client/secret_remove_test.go index 37c22650d1..03e0316cab 100644 --- a/client/secret_remove_test.go +++ b/client/secret_remove_test.go @@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "fmt" "io/ioutil" "net/http" @@ -10,7 +11,6 @@ import ( "github.com/gotestyourself/gotestyourself/assert" is "github.com/gotestyourself/gotestyourself/assert/cmp" - "golang.org/x/net/context" ) func TestSecretRemoveUnsupported(t *testing.T) { diff --git a/client/secret_update.go b/client/secret_update.go index 8efd35c1eb..164256bbc1 100644 --- a/client/secret_update.go +++ b/client/secret_update.go @@ -1,11 +1,11 @@ package client // import "github.com/docker/docker/client" import ( + "context" "net/url" "strconv" "github.com/docker/docker/api/types/swarm" - "golang.org/x/net/context" ) // SecretUpdate attempts to update a Secret diff --git a/client/secret_update_test.go b/client/secret_update_test.go index 3ff172ba53..d0ce89cda2 100644 --- a/client/secret_update_test.go +++ b/client/secret_update_test.go @@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "fmt" "io/ioutil" "net/http" @@ -11,7 +12,6 @@ import ( "github.com/docker/docker/api/types/swarm" "github.com/gotestyourself/gotestyourself/assert" is "github.com/gotestyourself/gotestyourself/assert/cmp" - "golang.org/x/net/context" ) func TestSecretUpdateUnsupported(t *testing.T) { diff --git a/client/service_create.go b/client/service_create.go index cf85ca4a18..871460c7b6 100644 --- a/client/service_create.go +++ b/client/service_create.go @@ -1,6 +1,7 @@ package client // import "github.com/docker/docker/client" import ( + "context" "encoding/json" "fmt" "strings" @@ -10,7 +11,6 @@ import ( "github.com/docker/docker/api/types/swarm" digest "github.com/opencontainers/go-digest" "github.com/pkg/errors" - "golang.org/x/net/context" ) // ServiceCreate creates a new Service. diff --git a/client/service_create_test.go b/client/service_create_test.go index c5d8ae4ff9..1ef2f422cd 100644 --- a/client/service_create_test.go +++ b/client/service_create_test.go @@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "encoding/json" "fmt" "io/ioutil" @@ -16,7 +17,6 @@ import ( is "github.com/gotestyourself/gotestyourself/assert/cmp" "github.com/opencontainers/go-digest" "github.com/opencontainers/image-spec/specs-go/v1" - "golang.org/x/net/context" ) func TestServiceCreateError(t *testing.T) { diff --git a/client/service_inspect.go b/client/service_inspect.go index b4c2944226..de6aa22de7 100644 --- a/client/service_inspect.go +++ b/client/service_inspect.go @@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "encoding/json" "fmt" "io/ioutil" @@ -9,7 +10,6 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/swarm" - "golang.org/x/net/context" ) // ServiceInspectWithRaw returns the service information and the raw data. diff --git a/client/service_inspect_test.go b/client/service_inspect_test.go index be5165a130..b69332ccc6 100644 --- a/client/service_inspect_test.go +++ b/client/service_inspect_test.go @@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "encoding/json" "fmt" "io/ioutil" @@ -12,7 +13,6 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/swarm" "github.com/pkg/errors" - "golang.org/x/net/context" ) func TestServiceInspectError(t *testing.T) { diff --git a/client/service_list.go b/client/service_list.go index fdb33cc221..7d53e2b9b9 100644 --- a/client/service_list.go +++ b/client/service_list.go @@ -1,13 +1,13 @@ package client // import "github.com/docker/docker/client" import ( + "context" "encoding/json" "net/url" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/swarm" - "golang.org/x/net/context" ) // ServiceList returns the list of services. diff --git a/client/service_list_test.go b/client/service_list_test.go index 482c7ddb5e..9903f9e71c 100644 --- a/client/service_list_test.go +++ b/client/service_list_test.go @@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "encoding/json" "fmt" "io/ioutil" @@ -12,7 +13,6 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/swarm" - "golang.org/x/net/context" ) func TestServiceListError(t *testing.T) { diff --git a/client/service_logs.go b/client/service_logs.go index 4b393bb494..af96b1e62c 100644 --- a/client/service_logs.go +++ b/client/service_logs.go @@ -1,12 +1,11 @@ package client // import "github.com/docker/docker/client" import ( + "context" "io" "net/url" "time" - "golang.org/x/net/context" - "github.com/docker/docker/api/types" timetypes "github.com/docker/docker/api/types/time" ) diff --git a/client/service_logs_test.go b/client/service_logs_test.go index e57b9bd1d6..764b7dad74 100644 --- a/client/service_logs_test.go +++ b/client/service_logs_test.go @@ -12,9 +12,9 @@ import ( "testing" "time" - "github.com/docker/docker/api/types" + "context" - "golang.org/x/net/context" + "github.com/docker/docker/api/types" ) func TestServiceLogsError(t *testing.T) { diff --git a/client/service_remove.go b/client/service_remove.go index 7ef04e8204..fe3421bec8 100644 --- a/client/service_remove.go +++ b/client/service_remove.go @@ -1,6 +1,6 @@ package client // import "github.com/docker/docker/client" -import "golang.org/x/net/context" +import "context" // ServiceRemove kills and removes a service. func (cli *Client) ServiceRemove(ctx context.Context, serviceID string) error { diff --git a/client/service_remove_test.go b/client/service_remove_test.go index 9198763f8e..45892ceb2f 100644 --- a/client/service_remove_test.go +++ b/client/service_remove_test.go @@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "fmt" "io/ioutil" "net/http" @@ -10,7 +11,6 @@ import ( "github.com/gotestyourself/gotestyourself/assert" is "github.com/gotestyourself/gotestyourself/assert/cmp" - "golang.org/x/net/context" ) func TestServiceRemoveError(t *testing.T) { diff --git a/client/service_update.go b/client/service_update.go index 57cb45d8d2..5a7a61b01f 100644 --- a/client/service_update.go +++ b/client/service_update.go @@ -1,13 +1,13 @@ package client // import "github.com/docker/docker/client" import ( + "context" "encoding/json" "net/url" "strconv" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/swarm" - "golang.org/x/net/context" ) // ServiceUpdate updates a Service. diff --git a/client/service_update_test.go b/client/service_update_test.go index 7e20c14b28..9a0a9ce0dd 100644 --- a/client/service_update_test.go +++ b/client/service_update_test.go @@ -2,14 +2,13 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "fmt" "io/ioutil" "net/http" "strings" "testing" - "golang.org/x/net/context" - "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/swarm" ) diff --git a/client/session.go b/client/session.go index b136538c22..c247123b45 100644 --- a/client/session.go +++ b/client/session.go @@ -1,10 +1,9 @@ package client // import "github.com/docker/docker/client" import ( + "context" "net" "net/http" - - "golang.org/x/net/context" ) // DialSession returns a connection that can be used communication with daemon diff --git a/client/swarm_get_unlock_key.go b/client/swarm_get_unlock_key.go index c02ae35c6d..0c50c01a8c 100644 --- a/client/swarm_get_unlock_key.go +++ b/client/swarm_get_unlock_key.go @@ -1,10 +1,10 @@ package client // import "github.com/docker/docker/client" import ( + "context" "encoding/json" "github.com/docker/docker/api/types" - "golang.org/x/net/context" ) // SwarmGetUnlockKey retrieves the swarm's unlock key. diff --git a/client/swarm_get_unlock_key_test.go b/client/swarm_get_unlock_key_test.go index aff79440fe..41b067affd 100644 --- a/client/swarm_get_unlock_key_test.go +++ b/client/swarm_get_unlock_key_test.go @@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "encoding/json" "fmt" "io/ioutil" @@ -13,7 +14,6 @@ import ( "github.com/docker/docker/internal/testutil" "github.com/gotestyourself/gotestyourself/assert" is "github.com/gotestyourself/gotestyourself/assert/cmp" - "golang.org/x/net/context" ) func TestSwarmGetUnlockKeyError(t *testing.T) { diff --git a/client/swarm_init.go b/client/swarm_init.go index 2997836317..742ca0f041 100644 --- a/client/swarm_init.go +++ b/client/swarm_init.go @@ -1,10 +1,10 @@ package client // import "github.com/docker/docker/client" import ( + "context" "encoding/json" "github.com/docker/docker/api/types/swarm" - "golang.org/x/net/context" ) // SwarmInit initializes the swarm. diff --git a/client/swarm_init_test.go b/client/swarm_init_test.go index ed8028fdcd..1abadc75e9 100644 --- a/client/swarm_init_test.go +++ b/client/swarm_init_test.go @@ -2,14 +2,13 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "fmt" "io/ioutil" "net/http" "strings" "testing" - "golang.org/x/net/context" - "github.com/docker/docker/api/types/swarm" ) diff --git a/client/swarm_inspect.go b/client/swarm_inspect.go index 02f42aa8a9..cfaabb25b1 100644 --- a/client/swarm_inspect.go +++ b/client/swarm_inspect.go @@ -1,10 +1,10 @@ package client // import "github.com/docker/docker/client" import ( + "context" "encoding/json" "github.com/docker/docker/api/types/swarm" - "golang.org/x/net/context" ) // SwarmInspect inspects the swarm. diff --git a/client/swarm_inspect_test.go b/client/swarm_inspect_test.go index 20a992a242..954adc94c6 100644 --- a/client/swarm_inspect_test.go +++ b/client/swarm_inspect_test.go @@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "encoding/json" "fmt" "io/ioutil" @@ -10,7 +11,6 @@ import ( "testing" "github.com/docker/docker/api/types/swarm" - "golang.org/x/net/context" ) func TestSwarmInspectError(t *testing.T) { diff --git a/client/swarm_join.go b/client/swarm_join.go index 13f8d79d6c..a1cf0455d2 100644 --- a/client/swarm_join.go +++ b/client/swarm_join.go @@ -1,8 +1,9 @@ package client // import "github.com/docker/docker/client" import ( + "context" + "github.com/docker/docker/api/types/swarm" - "golang.org/x/net/context" ) // SwarmJoin joins the swarm. diff --git a/client/swarm_join_test.go b/client/swarm_join_test.go index 384b2dd466..e67f2bdecf 100644 --- a/client/swarm_join_test.go +++ b/client/swarm_join_test.go @@ -2,14 +2,13 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "fmt" "io/ioutil" "net/http" "strings" "testing" - "golang.org/x/net/context" - "github.com/docker/docker/api/types/swarm" ) diff --git a/client/swarm_leave.go b/client/swarm_leave.go index d0d00cbb4a..90ca84b363 100644 --- a/client/swarm_leave.go +++ b/client/swarm_leave.go @@ -1,9 +1,8 @@ package client // import "github.com/docker/docker/client" import ( + "context" "net/url" - - "golang.org/x/net/context" ) // SwarmLeave leaves the swarm. diff --git a/client/swarm_leave_test.go b/client/swarm_leave_test.go index 5fb30c6ccc..3dd3711d04 100644 --- a/client/swarm_leave_test.go +++ b/client/swarm_leave_test.go @@ -2,13 +2,12 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "fmt" "io/ioutil" "net/http" "strings" "testing" - - "golang.org/x/net/context" ) func TestSwarmLeaveError(t *testing.T) { diff --git a/client/swarm_unlock.go b/client/swarm_unlock.go index 44a26bcc95..d2412f7d44 100644 --- a/client/swarm_unlock.go +++ b/client/swarm_unlock.go @@ -1,8 +1,9 @@ package client // import "github.com/docker/docker/client" import ( + "context" + "github.com/docker/docker/api/types/swarm" - "golang.org/x/net/context" ) // SwarmUnlock unlocks locked swarm. diff --git a/client/swarm_unlock_test.go b/client/swarm_unlock_test.go index 824221127a..93d5d69815 100644 --- a/client/swarm_unlock_test.go +++ b/client/swarm_unlock_test.go @@ -2,14 +2,13 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "fmt" "io/ioutil" "net/http" "strings" "testing" - "golang.org/x/net/context" - "github.com/docker/docker/api/types/swarm" ) diff --git a/client/swarm_update.go b/client/swarm_update.go index df6f1b0dc5..56a5bea761 100644 --- a/client/swarm_update.go +++ b/client/swarm_update.go @@ -1,12 +1,12 @@ package client // import "github.com/docker/docker/client" import ( + "context" "fmt" "net/url" "strconv" "github.com/docker/docker/api/types/swarm" - "golang.org/x/net/context" ) // SwarmUpdate updates the swarm. diff --git a/client/swarm_update_test.go b/client/swarm_update_test.go index f4ea525a8b..e908bf7860 100644 --- a/client/swarm_update_test.go +++ b/client/swarm_update_test.go @@ -2,14 +2,13 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "fmt" "io/ioutil" "net/http" "strings" "testing" - "golang.org/x/net/context" - "github.com/docker/docker/api/types/swarm" ) diff --git a/client/task_inspect.go b/client/task_inspect.go index 13e0a85cde..e1c0a736da 100644 --- a/client/task_inspect.go +++ b/client/task_inspect.go @@ -2,11 +2,11 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "encoding/json" "io/ioutil" "github.com/docker/docker/api/types/swarm" - "golang.org/x/net/context" ) // TaskInspectWithRaw returns the task information and its raw representation.. diff --git a/client/task_inspect_test.go b/client/task_inspect_test.go index 6ca98dde9c..fe5c5bd778 100644 --- a/client/task_inspect_test.go +++ b/client/task_inspect_test.go @@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "encoding/json" "fmt" "io/ioutil" @@ -11,7 +12,6 @@ import ( "github.com/docker/docker/api/types/swarm" "github.com/pkg/errors" - "golang.org/x/net/context" ) func TestTaskInspectError(t *testing.T) { diff --git a/client/task_list.go b/client/task_list.go index e56718012c..42d20c1b8d 100644 --- a/client/task_list.go +++ b/client/task_list.go @@ -1,13 +1,13 @@ package client // import "github.com/docker/docker/client" import ( + "context" "encoding/json" "net/url" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/swarm" - "golang.org/x/net/context" ) // TaskList returns the list of tasks. diff --git a/client/task_list_test.go b/client/task_list_test.go index 900afb66b2..16d0edaa0a 100644 --- a/client/task_list_test.go +++ b/client/task_list_test.go @@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "encoding/json" "fmt" "io/ioutil" @@ -12,7 +13,6 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/swarm" - "golang.org/x/net/context" ) func TestTaskListError(t *testing.T) { diff --git a/client/task_logs.go b/client/task_logs.go index cf0b3f6bba..6222fab577 100644 --- a/client/task_logs.go +++ b/client/task_logs.go @@ -1,12 +1,11 @@ package client // import "github.com/docker/docker/client" import ( + "context" "io" "net/url" "time" - "golang.org/x/net/context" - "github.com/docker/docker/api/types" timetypes "github.com/docker/docker/api/types/time" ) diff --git a/client/version.go b/client/version.go index 4bb60fab58..1989f6d6d2 100644 --- a/client/version.go +++ b/client/version.go @@ -1,10 +1,10 @@ package client // import "github.com/docker/docker/client" import ( + "context" "encoding/json" "github.com/docker/docker/api/types" - "golang.org/x/net/context" ) // ServerVersion returns information of the docker client and server host. diff --git a/client/volume_create.go b/client/volume_create.go index 8108b7b92f..639c325286 100644 --- a/client/volume_create.go +++ b/client/volume_create.go @@ -1,11 +1,11 @@ package client // import "github.com/docker/docker/client" import ( + "context" "encoding/json" "github.com/docker/docker/api/types" volumetypes "github.com/docker/docker/api/types/volume" - "golang.org/x/net/context" ) // VolumeCreate creates a volume in the docker host. diff --git a/client/volume_create_test.go b/client/volume_create_test.go index 69ed24a5bc..30b9a44db7 100644 --- a/client/volume_create_test.go +++ b/client/volume_create_test.go @@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "encoding/json" "fmt" "io/ioutil" @@ -11,7 +12,6 @@ import ( "github.com/docker/docker/api/types" volumetypes "github.com/docker/docker/api/types/volume" - "golang.org/x/net/context" ) func TestVolumeCreateError(t *testing.T) { diff --git a/client/volume_inspect.go b/client/volume_inspect.go index eb90f66fc6..f840682d2e 100644 --- a/client/volume_inspect.go +++ b/client/volume_inspect.go @@ -2,11 +2,11 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "encoding/json" "io/ioutil" "github.com/docker/docker/api/types" - "golang.org/x/net/context" ) // VolumeInspect returns the information about a specific volume in the docker host. diff --git a/client/volume_inspect_test.go b/client/volume_inspect_test.go index 4a2cf7c7d7..8c18bca07b 100644 --- a/client/volume_inspect_test.go +++ b/client/volume_inspect_test.go @@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "encoding/json" "fmt" "io/ioutil" @@ -14,7 +15,6 @@ import ( "github.com/gotestyourself/gotestyourself/assert" is "github.com/gotestyourself/gotestyourself/assert/cmp" "github.com/pkg/errors" - "golang.org/x/net/context" ) func TestVolumeInspectError(t *testing.T) { diff --git a/client/volume_list.go b/client/volume_list.go index aeca1cc1a3..4cf74831f1 100644 --- a/client/volume_list.go +++ b/client/volume_list.go @@ -1,12 +1,12 @@ package client // import "github.com/docker/docker/client" import ( + "context" "encoding/json" "net/url" "github.com/docker/docker/api/types/filters" volumetypes "github.com/docker/docker/api/types/volume" - "golang.org/x/net/context" ) // VolumeList returns the volumes configured in the docker host. diff --git a/client/volume_list_test.go b/client/volume_list_test.go index b7f9464171..c5e4bbb724 100644 --- a/client/volume_list_test.go +++ b/client/volume_list_test.go @@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "encoding/json" "fmt" "io/ioutil" @@ -12,7 +13,6 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" volumetypes "github.com/docker/docker/api/types/volume" - "golang.org/x/net/context" ) func TestVolumeListError(t *testing.T) { diff --git a/client/volume_prune.go b/client/volume_prune.go index 090a6a66df..70041efed8 100644 --- a/client/volume_prune.go +++ b/client/volume_prune.go @@ -1,12 +1,12 @@ package client // import "github.com/docker/docker/client" import ( + "context" "encoding/json" "fmt" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" - "golang.org/x/net/context" ) // VolumesPrune requests the daemon to delete unused data diff --git a/client/volume_remove.go b/client/volume_remove.go index 02ee573a73..fc5a71d334 100644 --- a/client/volume_remove.go +++ b/client/volume_remove.go @@ -1,10 +1,10 @@ package client // import "github.com/docker/docker/client" import ( + "context" "net/url" "github.com/docker/docker/api/types/versions" - "golang.org/x/net/context" ) // VolumeRemove removes a volume from the docker host. diff --git a/client/volume_remove_test.go b/client/volume_remove_test.go index 5364f70b04..31fb3d71aa 100644 --- a/client/volume_remove_test.go +++ b/client/volume_remove_test.go @@ -2,13 +2,12 @@ package client // import "github.com/docker/docker/client" import ( "bytes" + "context" "fmt" "io/ioutil" "net/http" "strings" "testing" - - "golang.org/x/net/context" ) func TestVolumeRemoveError(t *testing.T) { diff --git a/container/container.go b/container/container.go index 4e1fa918dd..5a6a9255be 100644 --- a/container/container.go +++ b/container/container.go @@ -2,6 +2,7 @@ package container // import "github.com/docker/docker/container" import ( "bytes" + "context" "encoding/json" "fmt" "io" @@ -47,7 +48,6 @@ import ( agentexec "github.com/docker/swarmkit/agent/exec" "github.com/pkg/errors" "github.com/sirupsen/logrus" - "golang.org/x/net/context" ) const configFileName = "config.v2.json" diff --git a/container/state.go b/container/state.go index 93c550dcd6..7c2a1ec81c 100644 --- a/container/state.go +++ b/container/state.go @@ -1,13 +1,12 @@ package container // import "github.com/docker/docker/container" import ( + "context" "errors" "fmt" "sync" "time" - "golang.org/x/net/context" - "github.com/docker/docker/api/types" "github.com/docker/go-units" ) diff --git a/container/stream/attach.go b/container/stream/attach.go index 1c0f438001..cee90b88a1 100644 --- a/container/stream/attach.go +++ b/container/stream/attach.go @@ -1,11 +1,10 @@ package stream // import "github.com/docker/docker/container/stream" import ( + "context" "io" "sync" - "golang.org/x/net/context" - "github.com/docker/docker/pkg/pools" "github.com/docker/docker/pkg/term" "github.com/sirupsen/logrus" diff --git a/daemon/auth.go b/daemon/auth.go index 0795ddfb06..d32c28b8dd 100644 --- a/daemon/auth.go +++ b/daemon/auth.go @@ -1,7 +1,7 @@ package daemon // import "github.com/docker/docker/daemon" import ( - "golang.org/x/net/context" + "context" "github.com/docker/docker/api/types" "github.com/docker/docker/dockerversion" diff --git a/daemon/cluster/cluster.go b/daemon/cluster/cluster.go index 92979fc11e..45a46b3f68 100644 --- a/daemon/cluster/cluster.go +++ b/daemon/cluster/cluster.go @@ -39,6 +39,7 @@ package cluster // import "github.com/docker/docker/daemon/cluster" // import ( + "context" "fmt" "net" "os" @@ -56,7 +57,6 @@ import ( swarmnode "github.com/docker/swarmkit/node" "github.com/pkg/errors" "github.com/sirupsen/logrus" - "golang.org/x/net/context" ) const swarmDirName = "swarm" diff --git a/daemon/cluster/configs.go b/daemon/cluster/configs.go index 16851855c4..6b373e618b 100644 --- a/daemon/cluster/configs.go +++ b/daemon/cluster/configs.go @@ -1,11 +1,12 @@ package cluster // import "github.com/docker/docker/daemon/cluster" import ( + "context" + apitypes "github.com/docker/docker/api/types" types "github.com/docker/docker/api/types/swarm" "github.com/docker/docker/daemon/cluster/convert" swarmapi "github.com/docker/swarmkit/api" - "golang.org/x/net/context" ) // GetConfig returns a config from a managed swarm cluster diff --git a/daemon/cluster/controllers/plugin/controller.go b/daemon/cluster/controllers/plugin/controller.go index f1d6dddb6a..c91925fbcc 100644 --- a/daemon/cluster/controllers/plugin/controller.go +++ b/daemon/cluster/controllers/plugin/controller.go @@ -1,6 +1,7 @@ package plugin // import "github.com/docker/docker/daemon/cluster/controllers/plugin" import ( + "context" "io" "io/ioutil" "net/http" @@ -15,7 +16,6 @@ import ( "github.com/gogo/protobuf/proto" "github.com/pkg/errors" "github.com/sirupsen/logrus" - "golang.org/x/net/context" ) // Controller is the controller for the plugin backend. diff --git a/daemon/cluster/controllers/plugin/controller_test.go b/daemon/cluster/controllers/plugin/controller_test.go index 44ee5c924e..8329d44766 100644 --- a/daemon/cluster/controllers/plugin/controller_test.go +++ b/daemon/cluster/controllers/plugin/controller_test.go @@ -1,6 +1,7 @@ package plugin // import "github.com/docker/docker/daemon/cluster/controllers/plugin" import ( + "context" "errors" "io" "io/ioutil" @@ -16,7 +17,6 @@ import ( "github.com/docker/docker/plugin" "github.com/docker/docker/plugin/v2" "github.com/sirupsen/logrus" - "golang.org/x/net/context" ) const ( diff --git a/daemon/cluster/executor/backend.go b/daemon/cluster/executor/backend.go index 3a5ff479bd..bcf099c882 100644 --- a/daemon/cluster/executor/backend.go +++ b/daemon/cluster/executor/backend.go @@ -1,6 +1,7 @@ package executor // import "github.com/docker/docker/daemon/cluster/executor" import ( + "context" "io" "time" @@ -21,7 +22,6 @@ import ( "github.com/docker/libnetwork/cluster" networktypes "github.com/docker/libnetwork/types" "github.com/docker/swarmkit/agent/exec" - "golang.org/x/net/context" ) // Backend defines the executor component for a swarm agent. diff --git a/daemon/cluster/executor/container/adapter.go b/daemon/cluster/executor/container/adapter.go index 4af6e3dd97..689a016630 100644 --- a/daemon/cluster/executor/container/adapter.go +++ b/daemon/cluster/executor/container/adapter.go @@ -1,6 +1,7 @@ package container // import "github.com/docker/docker/daemon/cluster/executor/container" import ( + "context" "encoding/base64" "encoding/json" "errors" @@ -28,7 +29,6 @@ import ( gogotypes "github.com/gogo/protobuf/types" "github.com/opencontainers/go-digest" "github.com/sirupsen/logrus" - "golang.org/x/net/context" "golang.org/x/time/rate" ) diff --git a/daemon/cluster/executor/container/attachment.go b/daemon/cluster/executor/container/attachment.go index 4d6e5c2983..55d4de5bd2 100644 --- a/daemon/cluster/executor/container/attachment.go +++ b/daemon/cluster/executor/container/attachment.go @@ -1,10 +1,11 @@ package container // import "github.com/docker/docker/daemon/cluster/executor/container" import ( + "context" + executorpkg "github.com/docker/docker/daemon/cluster/executor" "github.com/docker/swarmkit/agent/exec" "github.com/docker/swarmkit/api" - "golang.org/x/net/context" ) // networkAttacherController implements agent.Controller against docker's API. diff --git a/daemon/cluster/executor/container/controller.go b/daemon/cluster/executor/container/controller.go index 32bb114fde..99cce65686 100644 --- a/daemon/cluster/executor/container/controller.go +++ b/daemon/cluster/executor/container/controller.go @@ -1,6 +1,7 @@ package container // import "github.com/docker/docker/daemon/cluster/executor/container" import ( + "context" "fmt" "os" "strconv" @@ -17,7 +18,6 @@ import ( "github.com/docker/swarmkit/log" gogotypes "github.com/gogo/protobuf/types" "github.com/pkg/errors" - "golang.org/x/net/context" "golang.org/x/time/rate" ) diff --git a/daemon/cluster/executor/container/executor.go b/daemon/cluster/executor/container/executor.go index acd23fc422..262b248853 100644 --- a/daemon/cluster/executor/container/executor.go +++ b/daemon/cluster/executor/container/executor.go @@ -1,6 +1,7 @@ package container // import "github.com/docker/docker/daemon/cluster/executor/container" import ( + "context" "fmt" "sort" "strings" @@ -21,7 +22,6 @@ import ( "github.com/docker/swarmkit/api/naming" "github.com/docker/swarmkit/template" "github.com/sirupsen/logrus" - "golang.org/x/net/context" ) type executor struct { diff --git a/daemon/cluster/executor/container/health_test.go b/daemon/cluster/executor/container/health_test.go index 2054286417..79fc4ffcd7 100644 --- a/daemon/cluster/executor/container/health_test.go +++ b/daemon/cluster/executor/container/health_test.go @@ -3,6 +3,7 @@ package container // import "github.com/docker/docker/daemon/cluster/executor/container" import ( + "context" "testing" "time" @@ -11,7 +12,6 @@ import ( "github.com/docker/docker/daemon" "github.com/docker/docker/daemon/events" "github.com/docker/swarmkit/api" - "golang.org/x/net/context" ) func TestHealthStates(t *testing.T) { diff --git a/daemon/cluster/helpers.go b/daemon/cluster/helpers.go index 927aaad0ac..653593e1c0 100644 --- a/daemon/cluster/helpers.go +++ b/daemon/cluster/helpers.go @@ -1,12 +1,12 @@ package cluster // import "github.com/docker/docker/daemon/cluster" import ( + "context" "fmt" "github.com/docker/docker/errdefs" swarmapi "github.com/docker/swarmkit/api" "github.com/pkg/errors" - "golang.org/x/net/context" ) func getSwarm(ctx context.Context, c swarmapi.ControlClient) (*swarmapi.Cluster, error) { diff --git a/daemon/cluster/networks.go b/daemon/cluster/networks.go index 62c9138b3f..b8e31baa11 100644 --- a/daemon/cluster/networks.go +++ b/daemon/cluster/networks.go @@ -1,6 +1,7 @@ package cluster // import "github.com/docker/docker/daemon/cluster" import ( + "context" "fmt" apitypes "github.com/docker/docker/api/types" @@ -12,7 +13,6 @@ import ( swarmapi "github.com/docker/swarmkit/api" "github.com/pkg/errors" "github.com/sirupsen/logrus" - "golang.org/x/net/context" ) // GetNetworks returns all current cluster managed networks. diff --git a/daemon/cluster/noderunner.go b/daemon/cluster/noderunner.go index 45221347d7..bb3293ee2d 100644 --- a/daemon/cluster/noderunner.go +++ b/daemon/cluster/noderunner.go @@ -1,6 +1,7 @@ package cluster // import "github.com/docker/docker/daemon/cluster" import ( + "context" "fmt" "path/filepath" "runtime" @@ -15,7 +16,6 @@ import ( swarmnode "github.com/docker/swarmkit/node" "github.com/pkg/errors" "github.com/sirupsen/logrus" - "golang.org/x/net/context" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/daemon/cluster/nodes.go b/daemon/cluster/nodes.go index 12893d9078..3c073b0bac 100644 --- a/daemon/cluster/nodes.go +++ b/daemon/cluster/nodes.go @@ -1,12 +1,13 @@ package cluster // import "github.com/docker/docker/daemon/cluster" import ( + "context" + apitypes "github.com/docker/docker/api/types" types "github.com/docker/docker/api/types/swarm" "github.com/docker/docker/daemon/cluster/convert" "github.com/docker/docker/errdefs" swarmapi "github.com/docker/swarmkit/api" - "golang.org/x/net/context" ) // GetNodes returns a list of all nodes known to a cluster. diff --git a/daemon/cluster/secrets.go b/daemon/cluster/secrets.go index 45f246f483..c6fd842081 100644 --- a/daemon/cluster/secrets.go +++ b/daemon/cluster/secrets.go @@ -1,11 +1,12 @@ package cluster // import "github.com/docker/docker/daemon/cluster" import ( + "context" + apitypes "github.com/docker/docker/api/types" types "github.com/docker/docker/api/types/swarm" "github.com/docker/docker/daemon/cluster/convert" swarmapi "github.com/docker/swarmkit/api" - "golang.org/x/net/context" ) // GetSecret returns a secret from a managed swarm cluster diff --git a/daemon/cluster/services.go b/daemon/cluster/services.go index 3923ced6c0..ed438e93a0 100644 --- a/daemon/cluster/services.go +++ b/daemon/cluster/services.go @@ -1,6 +1,7 @@ package cluster // import "github.com/docker/docker/daemon/cluster" import ( + "context" "encoding/base64" "encoding/json" "fmt" @@ -22,7 +23,6 @@ import ( gogotypes "github.com/gogo/protobuf/types" "github.com/pkg/errors" "github.com/sirupsen/logrus" - "golang.org/x/net/context" ) // GetServices returns all services of a managed swarm cluster. diff --git a/daemon/cluster/swarm.go b/daemon/cluster/swarm.go index 2a97207f33..2f498ce263 100644 --- a/daemon/cluster/swarm.go +++ b/daemon/cluster/swarm.go @@ -1,6 +1,7 @@ package cluster // import "github.com/docker/docker/daemon/cluster" import ( + "context" "fmt" "net" "strings" @@ -18,7 +19,6 @@ import ( swarmnode "github.com/docker/swarmkit/node" "github.com/pkg/errors" "github.com/sirupsen/logrus" - "golang.org/x/net/context" ) // Init initializes new cluster from user provided request. diff --git a/daemon/cluster/tasks.go b/daemon/cluster/tasks.go index 8789613279..de1240dfe8 100644 --- a/daemon/cluster/tasks.go +++ b/daemon/cluster/tasks.go @@ -1,12 +1,13 @@ package cluster // import "github.com/docker/docker/daemon/cluster" import ( + "context" + apitypes "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" types "github.com/docker/docker/api/types/swarm" "github.com/docker/docker/daemon/cluster/convert" swarmapi "github.com/docker/swarmkit/api" - "golang.org/x/net/context" ) // GetTasks returns a list of tasks matching the filter options. diff --git a/daemon/disk_usage.go b/daemon/disk_usage.go index 344627afa0..f23a2f450f 100644 --- a/daemon/disk_usage.go +++ b/daemon/disk_usage.go @@ -1,11 +1,10 @@ package daemon // import "github.com/docker/docker/daemon" import ( + "context" "fmt" "sync/atomic" - "golang.org/x/net/context" - "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" "github.com/docker/docker/pkg/directory" diff --git a/daemon/exec.go b/daemon/exec.go index 6a94aca417..3f032d97f7 100644 --- a/daemon/exec.go +++ b/daemon/exec.go @@ -1,13 +1,12 @@ package daemon // import "github.com/docker/docker/daemon" import ( + "context" "fmt" "io" "strings" "time" - "golang.org/x/net/context" - "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/strslice" "github.com/docker/docker/container" diff --git a/daemon/health.go b/daemon/health.go index 3bbdc7ea21..ae0d7f8921 100644 --- a/daemon/health.go +++ b/daemon/health.go @@ -2,14 +2,13 @@ package daemon // import "github.com/docker/docker/daemon" import ( "bytes" + "context" "fmt" "runtime" "strings" "sync" "time" - "golang.org/x/net/context" - "github.com/docker/docker/api/types" containertypes "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/strslice" diff --git a/daemon/images/image_builder.go b/daemon/images/image_builder.go index b88e1bc0fa..ca7d0fda4a 100644 --- a/daemon/images/image_builder.go +++ b/daemon/images/image_builder.go @@ -1,6 +1,7 @@ package images // import "github.com/docker/docker/daemon/images" import ( + "context" "io" "github.com/docker/distribution/reference" @@ -14,7 +15,6 @@ import ( "github.com/docker/docker/pkg/system" "github.com/docker/docker/registry" "github.com/pkg/errors" - "golang.org/x/net/context" ) type roLayer struct { diff --git a/daemon/images/image_prune.go b/daemon/images/image_prune.go index 9427536759..da7f81322f 100644 --- a/daemon/images/image_prune.go +++ b/daemon/images/image_prune.go @@ -1,6 +1,7 @@ package images // import "github.com/docker/docker/daemon/images" import ( + "context" "fmt" "sync/atomic" "time" @@ -14,7 +15,6 @@ import ( "github.com/docker/docker/layer" digest "github.com/opencontainers/go-digest" "github.com/sirupsen/logrus" - "golang.org/x/net/context" ) var imagesAcceptedFilters = map[string]bool{ diff --git a/daemon/images/image_pull.go b/daemon/images/image_pull.go index 41056af678..e25e1d0631 100644 --- a/daemon/images/image_pull.go +++ b/daemon/images/image_pull.go @@ -1,6 +1,7 @@ package images // import "github.com/docker/docker/daemon/images" import ( + "context" "io" "runtime" "strings" @@ -14,7 +15,6 @@ import ( "github.com/docker/docker/pkg/progress" "github.com/docker/docker/registry" "github.com/opencontainers/go-digest" - "golang.org/x/net/context" ) // PullImage initiates a pull operation. image is the repository name to pull, and diff --git a/daemon/images/image_push.go b/daemon/images/image_push.go index af606a07b5..a1a6d7f6d1 100644 --- a/daemon/images/image_push.go +++ b/daemon/images/image_push.go @@ -1,6 +1,7 @@ package images // import "github.com/docker/docker/daemon/images" import ( + "context" "io" "github.com/docker/distribution/manifest/schema2" @@ -9,7 +10,6 @@ import ( "github.com/docker/docker/distribution" progressutils "github.com/docker/docker/distribution/utils" "github.com/docker/docker/pkg/progress" - "golang.org/x/net/context" ) // PushImage initiates a push operation on the repository named localName. diff --git a/daemon/images/image_search.go b/daemon/images/image_search.go index a901571439..8b65ec709c 100644 --- a/daemon/images/image_search.go +++ b/daemon/images/image_search.go @@ -1,10 +1,9 @@ package images // import "github.com/docker/docker/daemon/images" import ( + "context" "strconv" - "golang.org/x/net/context" - "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" registrytypes "github.com/docker/docker/api/types/registry" diff --git a/daemon/images/image_search_test.go b/daemon/images/image_search_test.go index 74795c5865..4fef86b6f2 100644 --- a/daemon/images/image_search_test.go +++ b/daemon/images/image_search_test.go @@ -1,12 +1,11 @@ package images // import "github.com/docker/docker/daemon/images" import ( + "context" "errors" "strings" "testing" - "golang.org/x/net/context" - "github.com/docker/docker/api/types" registrytypes "github.com/docker/docker/api/types/registry" "github.com/docker/docker/registry" diff --git a/daemon/logger/gcplogs/gcplogging.go b/daemon/logger/gcplogs/gcplogging.go index f0ffb84939..08b632b627 100644 --- a/daemon/logger/gcplogs/gcplogging.go +++ b/daemon/logger/gcplogs/gcplogging.go @@ -6,12 +6,13 @@ import ( "sync/atomic" "time" + "context" + "github.com/docker/docker/daemon/logger" "cloud.google.com/go/compute/metadata" "cloud.google.com/go/logging" "github.com/sirupsen/logrus" - "golang.org/x/net/context" mrpb "google.golang.org/genproto/googleapis/api/monitoredres" ) diff --git a/daemon/logs.go b/daemon/logs.go index f1ca5c9a06..8ef8d00d23 100644 --- a/daemon/logs.go +++ b/daemon/logs.go @@ -1,11 +1,10 @@ package daemon // import "github.com/docker/docker/daemon" import ( + "context" "strconv" "time" - "golang.org/x/net/context" - "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/backend" containertypes "github.com/docker/docker/api/types/container" diff --git a/daemon/network.go b/daemon/network.go index 0f2e9c2526..414caf1c58 100644 --- a/daemon/network.go +++ b/daemon/network.go @@ -1,6 +1,7 @@ package daemon // import "github.com/docker/docker/daemon" import ( + "context" "fmt" "net" "runtime" @@ -21,7 +22,6 @@ import ( networktypes "github.com/docker/libnetwork/types" "github.com/pkg/errors" "github.com/sirupsen/logrus" - "golang.org/x/net/context" ) // PredefinedNetworkError is returned when user tries to create predefined network that already exists. diff --git a/daemon/prune.go b/daemon/prune.go index ba7e3485d0..a928831e36 100644 --- a/daemon/prune.go +++ b/daemon/prune.go @@ -1,6 +1,7 @@ package daemon // import "github.com/docker/docker/daemon" import ( + "context" "fmt" "regexp" "sync/atomic" @@ -14,7 +15,6 @@ import ( "github.com/docker/docker/volume" "github.com/docker/libnetwork" "github.com/sirupsen/logrus" - "golang.org/x/net/context" ) var ( diff --git a/daemon/stats.go b/daemon/stats.go index c91d05302e..eb23e272ae 100644 --- a/daemon/stats.go +++ b/daemon/stats.go @@ -1,13 +1,12 @@ package daemon // import "github.com/docker/docker/daemon" import ( + "context" "encoding/json" "errors" "runtime" "time" - "golang.org/x/net/context" - "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/backend" "github.com/docker/docker/api/types/versions" diff --git a/daemon/wait.go b/daemon/wait.go index bd4a9f0eb4..545f24c7b2 100644 --- a/daemon/wait.go +++ b/daemon/wait.go @@ -1,8 +1,9 @@ package daemon // import "github.com/docker/docker/daemon" import ( + "context" + "github.com/docker/docker/container" - "golang.org/x/net/context" ) // ContainerWait waits until the given container is in a certain state diff --git a/distribution/config.go b/distribution/config.go index 44aacd732e..55f1f8c2df 100644 --- a/distribution/config.go +++ b/distribution/config.go @@ -1,6 +1,7 @@ package distribution // import "github.com/docker/docker/distribution" import ( + "context" "encoding/json" "fmt" "io" @@ -20,7 +21,6 @@ import ( "github.com/docker/libtrust" "github.com/opencontainers/go-digest" specs "github.com/opencontainers/image-spec/specs-go/v1" - "golang.org/x/net/context" ) // Config stores configuration for communicating diff --git a/distribution/pull.go b/distribution/pull.go index 401d8f1471..0240eb05f7 100644 --- a/distribution/pull.go +++ b/distribution/pull.go @@ -1,6 +1,7 @@ package distribution // import "github.com/docker/docker/distribution" import ( + "context" "fmt" "runtime" @@ -13,7 +14,6 @@ import ( "github.com/opencontainers/go-digest" "github.com/pkg/errors" "github.com/sirupsen/logrus" - "golang.org/x/net/context" ) // Puller is an interface that abstracts pulling for different API versions. diff --git a/distribution/pull_v1.go b/distribution/pull_v1.go index e0d4a6e2ff..c26d881223 100644 --- a/distribution/pull_v1.go +++ b/distribution/pull_v1.go @@ -1,6 +1,7 @@ package distribution // import "github.com/docker/docker/distribution" import ( + "context" "errors" "fmt" "io" @@ -25,7 +26,6 @@ import ( "github.com/docker/docker/pkg/stringid" "github.com/docker/docker/registry" "github.com/sirupsen/logrus" - "golang.org/x/net/context" ) type v1Puller struct { diff --git a/distribution/pull_v2.go b/distribution/pull_v2.go index a1316920f3..93b9a5a6f0 100644 --- a/distribution/pull_v2.go +++ b/distribution/pull_v2.go @@ -1,6 +1,7 @@ package distribution // import "github.com/docker/docker/distribution" import ( + "context" "encoding/json" "fmt" "io" @@ -33,7 +34,6 @@ import ( specs "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pkg/errors" "github.com/sirupsen/logrus" - "golang.org/x/net/context" ) var ( diff --git a/distribution/push.go b/distribution/push.go index 2021970116..eb3bc55974 100644 --- a/distribution/push.go +++ b/distribution/push.go @@ -3,6 +3,7 @@ package distribution // import "github.com/docker/docker/distribution" import ( "bufio" "compress/gzip" + "context" "fmt" "io" @@ -11,7 +12,6 @@ import ( "github.com/docker/docker/pkg/progress" "github.com/docker/docker/registry" "github.com/sirupsen/logrus" - "golang.org/x/net/context" ) // Pusher is an interface that abstracts pushing for different API versions. diff --git a/distribution/push_v1.go b/distribution/push_v1.go index 3578c060e0..7bd75e9fe6 100644 --- a/distribution/push_v1.go +++ b/distribution/push_v1.go @@ -1,6 +1,7 @@ package distribution // import "github.com/docker/docker/distribution" import ( + "context" "fmt" "sync" @@ -18,7 +19,6 @@ import ( "github.com/docker/docker/registry" "github.com/opencontainers/go-digest" "github.com/sirupsen/logrus" - "golang.org/x/net/context" ) type v1Pusher struct { diff --git a/distribution/push_v2.go b/distribution/push_v2.go index f7b9a6d657..5e360591f4 100644 --- a/distribution/push_v2.go +++ b/distribution/push_v2.go @@ -1,6 +1,7 @@ package distribution // import "github.com/docker/docker/distribution" import ( + "context" "errors" "fmt" "io" @@ -9,8 +10,6 @@ import ( "strings" "sync" - "golang.org/x/net/context" - "github.com/docker/distribution" "github.com/docker/distribution/manifest/schema1" "github.com/docker/distribution/manifest/schema2" diff --git a/distribution/registry.go b/distribution/registry.go index 7f0987a4bb..9f5bc47d32 100644 --- a/distribution/registry.go +++ b/distribution/registry.go @@ -1,6 +1,7 @@ package distribution // import "github.com/docker/docker/distribution" import ( + "context" "fmt" "net" "net/http" @@ -16,7 +17,6 @@ import ( "github.com/docker/docker/dockerversion" "github.com/docker/docker/registry" "github.com/docker/go-connections/sockets" - "golang.org/x/net/context" ) // ImageTypes represents the schema2 config types for images diff --git a/distribution/registry_unit_test.go b/distribution/registry_unit_test.go index 42d22fd4fb..5ae529d23d 100644 --- a/distribution/registry_unit_test.go +++ b/distribution/registry_unit_test.go @@ -1,6 +1,7 @@ package distribution // import "github.com/docker/docker/distribution" import ( + "context" "net/http" "net/http/httptest" "net/url" @@ -13,7 +14,6 @@ import ( registrytypes "github.com/docker/docker/api/types/registry" "github.com/docker/docker/registry" "github.com/sirupsen/logrus" - "golang.org/x/net/context" ) const secretRegistryToken = "mysecrettoken" diff --git a/distribution/xfer/download.go b/distribution/xfer/download.go index 90258f46ba..e8cda93628 100644 --- a/distribution/xfer/download.go +++ b/distribution/xfer/download.go @@ -1,6 +1,7 @@ package xfer // import "github.com/docker/docker/distribution/xfer" import ( + "context" "errors" "fmt" "io" @@ -15,7 +16,6 @@ import ( "github.com/docker/docker/pkg/progress" "github.com/docker/docker/pkg/system" "github.com/sirupsen/logrus" - "golang.org/x/net/context" ) const maxDownloadAttempts = 5 diff --git a/distribution/xfer/download_test.go b/distribution/xfer/download_test.go index d5d8ffb01c..4ab3705af6 100644 --- a/distribution/xfer/download_test.go +++ b/distribution/xfer/download_test.go @@ -2,6 +2,7 @@ package xfer // import "github.com/docker/docker/distribution/xfer" import ( "bytes" + "context" "errors" "fmt" "io" @@ -16,7 +17,6 @@ import ( "github.com/docker/docker/layer" "github.com/docker/docker/pkg/progress" "github.com/opencontainers/go-digest" - "golang.org/x/net/context" ) const maxDownloadConcurrency = 3 diff --git a/distribution/xfer/transfer.go b/distribution/xfer/transfer.go index 2c8c16d66f..c356fde8d3 100644 --- a/distribution/xfer/transfer.go +++ b/distribution/xfer/transfer.go @@ -1,11 +1,11 @@ package xfer // import "github.com/docker/docker/distribution/xfer" import ( + "context" "runtime" "sync" "github.com/docker/docker/pkg/progress" - "golang.org/x/net/context" ) // DoNotRetry is an error wrapper indicating that the error cannot be resolved diff --git a/distribution/xfer/upload.go b/distribution/xfer/upload.go index b60adf3220..33b45ad747 100644 --- a/distribution/xfer/upload.go +++ b/distribution/xfer/upload.go @@ -1,6 +1,7 @@ package xfer // import "github.com/docker/docker/distribution/xfer" import ( + "context" "errors" "time" @@ -8,7 +9,6 @@ import ( "github.com/docker/docker/layer" "github.com/docker/docker/pkg/progress" "github.com/sirupsen/logrus" - "golang.org/x/net/context" ) const maxUploadAttempts = 5 diff --git a/distribution/xfer/upload_test.go b/distribution/xfer/upload_test.go index 43790e4b92..4507feac7b 100644 --- a/distribution/xfer/upload_test.go +++ b/distribution/xfer/upload_test.go @@ -1,6 +1,7 @@ package xfer // import "github.com/docker/docker/distribution/xfer" import ( + "context" "errors" "sync/atomic" "testing" @@ -9,7 +10,6 @@ import ( "github.com/docker/distribution" "github.com/docker/docker/layer" "github.com/docker/docker/pkg/progress" - "golang.org/x/net/context" ) const maxUploadConcurrency = 3 diff --git a/dockerversion/useragent.go b/dockerversion/useragent.go index bb531c671f..2eceb6fa9e 100644 --- a/dockerversion/useragent.go +++ b/dockerversion/useragent.go @@ -1,12 +1,12 @@ package dockerversion // import "github.com/docker/docker/dockerversion" import ( + "context" "fmt" "runtime" "github.com/docker/docker/pkg/parsers/kernel" "github.com/docker/docker/pkg/useragent" - "golang.org/x/net/context" ) // UAStringKey is used as key type for user-agent string in net/context struct diff --git a/integration-cli/check_test.go b/integration-cli/check_test.go index 373b8656e1..76b17627e7 100644 --- a/integration-cli/check_test.go +++ b/integration-cli/check_test.go @@ -1,6 +1,7 @@ package main import ( + "context" "fmt" "io/ioutil" "net/http/httptest" @@ -24,7 +25,6 @@ import ( "github.com/docker/docker/internal/test/registry" "github.com/docker/docker/pkg/reexec" "github.com/go-check/check" - "golang.org/x/net/context" ) const ( diff --git a/integration-cli/daemon/daemon_swarm.go b/integration-cli/daemon/daemon_swarm.go index cf75724a32..c38f5a69e0 100644 --- a/integration-cli/daemon/daemon_swarm.go +++ b/integration-cli/daemon/daemon_swarm.go @@ -1,6 +1,7 @@ package daemon // import "github.com/docker/docker/integration-cli/daemon" import ( + "context" "fmt" "strings" @@ -11,7 +12,6 @@ import ( "github.com/docker/docker/integration-cli/checker" "github.com/go-check/check" "github.com/gotestyourself/gotestyourself/assert" - "golang.org/x/net/context" ) // CheckServiceTasksInState returns the number of tasks with a matching state, diff --git a/integration-cli/docker_api_build_test.go b/integration-cli/docker_api_build_test.go index e997274a05..e2c4780274 100644 --- a/integration-cli/docker_api_build_test.go +++ b/integration-cli/docker_api_build_test.go @@ -3,6 +3,7 @@ package main import ( "archive/tar" "bytes" + "context" "encoding/json" "fmt" "io" @@ -20,7 +21,6 @@ import ( "github.com/go-check/check" "github.com/gotestyourself/gotestyourself/assert" is "github.com/gotestyourself/gotestyourself/assert/cmp" - "golang.org/x/net/context" ) func (s *DockerSuite) TestBuildAPIDockerFileRemote(c *check.C) { diff --git a/integration-cli/docker_api_containers_test.go b/integration-cli/docker_api_containers_test.go index 6b8b10119d..c2e26bf0ba 100644 --- a/integration-cli/docker_api_containers_test.go +++ b/integration-cli/docker_api_containers_test.go @@ -3,6 +3,7 @@ package main import ( "archive/tar" "bytes" + "context" "encoding/json" "fmt" "io" @@ -34,7 +35,6 @@ import ( "github.com/gotestyourself/gotestyourself/assert" is "github.com/gotestyourself/gotestyourself/assert/cmp" "github.com/gotestyourself/gotestyourself/poll" - "golang.org/x/net/context" ) func (s *DockerSuite) TestContainerAPIGetAll(c *check.C) { diff --git a/integration-cli/docker_api_containers_windows_test.go b/integration-cli/docker_api_containers_windows_test.go index 4c8ace4842..8b71fc6077 100644 --- a/integration-cli/docker_api_containers_windows_test.go +++ b/integration-cli/docker_api_containers_windows_test.go @@ -3,6 +3,7 @@ package main import ( + "context" "fmt" "io/ioutil" "math/rand" @@ -15,7 +16,6 @@ import ( "github.com/go-check/check" "github.com/gotestyourself/gotestyourself/assert" is "github.com/gotestyourself/gotestyourself/assert/cmp" - "golang.org/x/net/context" ) func (s *DockerSuite) TestContainersAPICreateMountsBindNamedPipe(c *check.C) { diff --git a/integration-cli/docker_api_exec_test.go b/integration-cli/docker_api_exec_test.go index a23cedc0dc..dc12c460e7 100644 --- a/integration-cli/docker_api_exec_test.go +++ b/integration-cli/docker_api_exec_test.go @@ -4,6 +4,7 @@ package main import ( "bytes" + "context" "encoding/json" "fmt" "io/ioutil" @@ -17,7 +18,6 @@ import ( "github.com/docker/docker/integration-cli/checker" "github.com/docker/docker/internal/test/request" "github.com/go-check/check" - "golang.org/x/net/context" ) // Regression test for #9414 diff --git a/integration-cli/docker_api_images_test.go b/integration-cli/docker_api_images_test.go index 21bfbc6217..da1c8c8f28 100644 --- a/integration-cli/docker_api_images_test.go +++ b/integration-cli/docker_api_images_test.go @@ -1,6 +1,7 @@ package main import ( + "context" "net/http" "net/http/httptest" "strings" @@ -13,7 +14,6 @@ import ( "github.com/docker/docker/integration-cli/cli/build" "github.com/docker/docker/internal/test/request" "github.com/go-check/check" - "golang.org/x/net/context" ) func (s *DockerSuite) TestAPIImagesFilter(c *check.C) { diff --git a/integration-cli/docker_api_inspect_test.go b/integration-cli/docker_api_inspect_test.go index 2f81d6e1eb..5d7aa55903 100644 --- a/integration-cli/docker_api_inspect_test.go +++ b/integration-cli/docker_api_inspect_test.go @@ -1,11 +1,10 @@ package main import ( + "context" "encoding/json" "strings" - "golang.org/x/net/context" - "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/versions/v1p20" "github.com/docker/docker/client" diff --git a/integration-cli/docker_api_ipcmode_test.go b/integration-cli/docker_api_ipcmode_test.go index 5bca6d0d78..832fe658de 100644 --- a/integration-cli/docker_api_ipcmode_test.go +++ b/integration-cli/docker_api_ipcmode_test.go @@ -3,6 +3,7 @@ package main import ( "bufio" + "context" "fmt" "io/ioutil" "os" @@ -13,7 +14,6 @@ import ( "github.com/docker/docker/integration-cli/checker" "github.com/docker/docker/integration-cli/cli" "github.com/go-check/check" - "golang.org/x/net/context" ) /* testIpcCheckDevExists checks whether a given mount (identified by its diff --git a/integration-cli/docker_api_logs_test.go b/integration-cli/docker_api_logs_test.go index 36dbb4bbb5..bf5f8ab4ba 100644 --- a/integration-cli/docker_api_logs_test.go +++ b/integration-cli/docker_api_logs_test.go @@ -3,6 +3,7 @@ package main import ( "bufio" "bytes" + "context" "fmt" "io" "io/ioutil" @@ -17,7 +18,6 @@ import ( "github.com/docker/docker/internal/test/request" "github.com/docker/docker/pkg/stdcopy" "github.com/go-check/check" - "golang.org/x/net/context" ) func (s *DockerSuite) TestLogsAPIWithStdout(c *check.C) { diff --git a/integration-cli/docker_api_stats_test.go b/integration-cli/docker_api_stats_test.go index 5606ddbd68..3954e4b2e0 100644 --- a/integration-cli/docker_api_stats_test.go +++ b/integration-cli/docker_api_stats_test.go @@ -1,6 +1,7 @@ package main import ( + "context" "encoding/json" "fmt" "net/http" @@ -17,7 +18,6 @@ import ( "github.com/docker/docker/integration-cli/checker" "github.com/docker/docker/internal/test/request" "github.com/go-check/check" - "golang.org/x/net/context" ) var expectedNetworkInterfaceStats = strings.Split("rx_bytes rx_dropped rx_errors rx_packets tx_bytes tx_dropped tx_errors tx_packets", " ") diff --git a/integration-cli/docker_api_swarm_service_test.go b/integration-cli/docker_api_swarm_service_test.go index d56230a6e8..2e27c7e93d 100644 --- a/integration-cli/docker_api_swarm_service_test.go +++ b/integration-cli/docker_api_swarm_service_test.go @@ -3,6 +3,7 @@ package main import ( + "context" "fmt" "strconv" "strings" @@ -17,7 +18,6 @@ import ( testdaemon "github.com/docker/docker/internal/test/daemon" "github.com/go-check/check" "github.com/gotestyourself/gotestyourself/icmd" - "golang.org/x/net/context" "golang.org/x/sys/unix" ) diff --git a/integration-cli/docker_api_swarm_test.go b/integration-cli/docker_api_swarm_test.go index 27f00ac07c..11cdd89215 100644 --- a/integration-cli/docker_api_swarm_test.go +++ b/integration-cli/docker_api_swarm_test.go @@ -3,6 +3,7 @@ package main import ( + "context" "fmt" "io/ioutil" "net" @@ -27,7 +28,6 @@ import ( "github.com/go-check/check" "github.com/gotestyourself/gotestyourself/assert" is "github.com/gotestyourself/gotestyourself/assert/cmp" - "golang.org/x/net/context" ) var defaultReconciliationTimeout = 30 * time.Second diff --git a/integration-cli/docker_cli_events_test.go b/integration-cli/docker_cli_events_test.go index bc73badbdf..28e418ea3b 100644 --- a/integration-cli/docker_cli_events_test.go +++ b/integration-cli/docker_cli_events_test.go @@ -2,6 +2,7 @@ package main import ( "bufio" + "context" "encoding/json" "fmt" "io" @@ -20,7 +21,6 @@ import ( "github.com/docker/docker/integration-cli/cli/build" "github.com/go-check/check" "github.com/gotestyourself/gotestyourself/icmd" - "golang.org/x/net/context" ) func (s *DockerSuite) TestEventsTimestampFormats(c *check.C) { diff --git a/integration-cli/docker_cli_exec_test.go b/integration-cli/docker_cli_exec_test.go index e915e1e7e4..9804b3a643 100644 --- a/integration-cli/docker_cli_exec_test.go +++ b/integration-cli/docker_cli_exec_test.go @@ -4,6 +4,7 @@ package main import ( "bufio" + "context" "fmt" "os" "os/exec" @@ -20,7 +21,6 @@ import ( "github.com/docker/docker/integration-cli/cli/build" "github.com/go-check/check" "github.com/gotestyourself/gotestyourself/icmd" - "golang.org/x/net/context" ) func (s *DockerSuite) TestExec(c *check.C) { diff --git a/integration-cli/docker_cli_plugins_logdriver_test.go b/integration-cli/docker_cli_plugins_logdriver_test.go index 8104b3b766..7d1ffcb632 100644 --- a/integration-cli/docker_cli_plugins_logdriver_test.go +++ b/integration-cli/docker_cli_plugins_logdriver_test.go @@ -1,12 +1,12 @@ package main import ( + "context" "strings" "github.com/docker/docker/client" "github.com/docker/docker/integration-cli/checker" "github.com/go-check/check" - "golang.org/x/net/context" ) func (s *DockerSuite) TestPluginLogDriver(c *check.C) { diff --git a/integration-cli/docker_cli_plugins_test.go b/integration-cli/docker_cli_plugins_test.go index 346a2cfed7..391c74aa5d 100644 --- a/integration-cli/docker_cli_plugins_test.go +++ b/integration-cli/docker_cli_plugins_test.go @@ -1,6 +1,7 @@ package main import ( + "context" "fmt" "io/ioutil" "net/http" @@ -16,7 +17,6 @@ import ( "github.com/docker/docker/integration-cli/daemon" "github.com/docker/docker/internal/test/fixtures/plugin" "github.com/go-check/check" - "golang.org/x/net/context" ) var ( diff --git a/integration-cli/docker_cli_run_test.go b/integration-cli/docker_cli_run_test.go index f040788280..7e0efdc08f 100644 --- a/integration-cli/docker_cli_run_test.go +++ b/integration-cli/docker_cli_run_test.go @@ -3,6 +3,7 @@ package main import ( "bufio" "bytes" + "context" "encoding/json" "fmt" "io" @@ -36,7 +37,6 @@ import ( "github.com/docker/libnetwork/types" "github.com/go-check/check" "github.com/gotestyourself/gotestyourself/icmd" - "golang.org/x/net/context" ) // "test123" should be printed by docker run diff --git a/integration-cli/docker_cli_swarm_test.go b/integration-cli/docker_cli_swarm_test.go index 56fde1f1ec..94013d82b3 100644 --- a/integration-cli/docker_cli_swarm_test.go +++ b/integration-cli/docker_cli_swarm_test.go @@ -4,6 +4,7 @@ package main import ( "bytes" + "context" "encoding/json" "encoding/pem" "fmt" @@ -29,7 +30,6 @@ import ( "github.com/gotestyourself/gotestyourself/fs" "github.com/gotestyourself/gotestyourself/icmd" "github.com/vishvananda/netlink" - "golang.org/x/net/context" ) func (s *DockerSwarmSuite) TestSwarmUpdate(c *check.C) { diff --git a/integration-cli/docker_cli_volume_test.go b/integration-cli/docker_cli_volume_test.go index fc930d319c..ad1e96577c 100644 --- a/integration-cli/docker_cli_volume_test.go +++ b/integration-cli/docker_cli_volume_test.go @@ -1,6 +1,7 @@ package main import ( + "context" "fmt" "io/ioutil" "os" @@ -16,7 +17,6 @@ import ( "github.com/docker/docker/integration-cli/cli/build" "github.com/go-check/check" "github.com/gotestyourself/gotestyourself/icmd" - "golang.org/x/net/context" ) func (s *DockerSuite) TestVolumeCLICreate(c *check.C) { diff --git a/integration-cli/docker_utils_test.go b/integration-cli/docker_utils_test.go index 93006395d5..19fdcff19a 100644 --- a/integration-cli/docker_utils_test.go +++ b/integration-cli/docker_utils_test.go @@ -1,6 +1,7 @@ package main import ( + "context" "encoding/json" "errors" "fmt" @@ -21,7 +22,6 @@ import ( "github.com/docker/docker/internal/test/request" "github.com/go-check/check" "github.com/gotestyourself/gotestyourself/icmd" - "golang.org/x/net/context" ) // Deprecated diff --git a/integration/config/config_test.go b/integration/config/config_test.go index 26888b1784..949c3ae004 100644 --- a/integration/config/config_test.go +++ b/integration/config/config_test.go @@ -2,6 +2,7 @@ package config // import "github.com/docker/docker/integration/config" import ( "bytes" + "context" "encoding/json" "sort" "testing" @@ -17,7 +18,6 @@ import ( "github.com/gotestyourself/gotestyourself/assert" is "github.com/gotestyourself/gotestyourself/assert/cmp" "github.com/gotestyourself/gotestyourself/skip" - "golang.org/x/net/context" ) func TestConfigList(t *testing.T) { diff --git a/integration/internal/container/exec.go b/integration/internal/container/exec.go index 2af0b90738..55ad23aeb5 100644 --- a/integration/internal/container/exec.go +++ b/integration/internal/container/exec.go @@ -2,11 +2,11 @@ package container import ( "bytes" + "context" "github.com/docker/docker/api/types" "github.com/docker/docker/client" "github.com/docker/docker/pkg/stdcopy" - "golang.org/x/net/context" ) // ExecResult represents a result returned from Exec() diff --git a/integration/internal/container/states.go b/integration/internal/container/states.go index 27d9973e00..1ee73e01a6 100644 --- a/integration/internal/container/states.go +++ b/integration/internal/container/states.go @@ -1,11 +1,11 @@ package container import ( + "context" "strings" "github.com/docker/docker/client" "github.com/gotestyourself/gotestyourself/poll" - "golang.org/x/net/context" ) // IsStopped verifies the container is in stopped state. diff --git a/integration/network/inspect_test.go b/integration/network/inspect_test.go index 8142ecdef2..f666c9b128 100644 --- a/integration/network/inspect_test.go +++ b/integration/network/inspect_test.go @@ -1,6 +1,7 @@ package network // import "github.com/docker/docker/integration/network" import ( + "context" "testing" "time" @@ -11,7 +12,6 @@ import ( "github.com/docker/docker/integration/internal/swarm" "github.com/gotestyourself/gotestyourself/assert" "github.com/gotestyourself/gotestyourself/poll" - "golang.org/x/net/context" ) const defaultSwarmPort = 2477 diff --git a/integration/network/ipvlan/ipvlan_test.go b/integration/network/ipvlan/ipvlan_test.go index d42917db27..001565eefd 100644 --- a/integration/network/ipvlan/ipvlan_test.go +++ b/integration/network/ipvlan/ipvlan_test.go @@ -1,6 +1,7 @@ package ipvlan import ( + "context" "strings" "testing" "time" @@ -13,7 +14,6 @@ import ( "github.com/docker/docker/internal/test/daemon" "github.com/gotestyourself/gotestyourself/assert" "github.com/gotestyourself/gotestyourself/skip" - "golang.org/x/net/context" ) func TestDockerNetworkIpvlanPersistance(t *testing.T) { diff --git a/integration/network/service_test.go b/integration/network/service_test.go index 8efd7d1fac..4ff2e3858a 100644 --- a/integration/network/service_test.go +++ b/integration/network/service_test.go @@ -1,6 +1,7 @@ package network // import "github.com/docker/docker/integration/network" import ( + "context" "testing" "time" @@ -10,7 +11,6 @@ import ( "github.com/docker/docker/integration/internal/swarm" "github.com/gotestyourself/gotestyourself/assert" "github.com/gotestyourself/gotestyourself/poll" - "golang.org/x/net/context" ) func TestServiceWithPredefinedNetwork(t *testing.T) { diff --git a/integration/secret/secret_test.go b/integration/secret/secret_test.go index 5ad763a601..ea4dc7c7e9 100644 --- a/integration/secret/secret_test.go +++ b/integration/secret/secret_test.go @@ -2,6 +2,7 @@ package secret // import "github.com/docker/docker/integration/secret" import ( "bytes" + "context" "sort" "testing" "time" @@ -16,7 +17,6 @@ import ( "github.com/gotestyourself/gotestyourself/assert" is "github.com/gotestyourself/gotestyourself/assert/cmp" "github.com/gotestyourself/gotestyourself/skip" - "golang.org/x/net/context" ) func TestSecretInspect(t *testing.T) { diff --git a/integration/service/create_test.go b/integration/service/create_test.go index 767d78b368..36de77316b 100644 --- a/integration/service/create_test.go +++ b/integration/service/create_test.go @@ -1,6 +1,7 @@ package service // import "github.com/docker/docker/integration/service" import ( + "context" "io/ioutil" "testing" "time" @@ -13,7 +14,6 @@ import ( "github.com/gotestyourself/gotestyourself/assert" is "github.com/gotestyourself/gotestyourself/assert/cmp" "github.com/gotestyourself/gotestyourself/poll" - "golang.org/x/net/context" ) func TestCreateServiceMultipleTimes(t *testing.T) { diff --git a/integration/service/inspect_test.go b/integration/service/inspect_test.go index e437f35888..7492a4fc02 100644 --- a/integration/service/inspect_test.go +++ b/integration/service/inspect_test.go @@ -1,6 +1,7 @@ package service // import "github.com/docker/docker/integration/service" import ( + "context" "testing" "time" @@ -15,7 +16,6 @@ import ( is "github.com/gotestyourself/gotestyourself/assert/cmp" "github.com/gotestyourself/gotestyourself/poll" "github.com/gotestyourself/gotestyourself/skip" - "golang.org/x/net/context" ) func TestInspect(t *testing.T) { diff --git a/integration/system/info_linux_test.go b/integration/system/info_linux_test.go index c08fae1320..15bd69fdf6 100644 --- a/integration/system/info_linux_test.go +++ b/integration/system/info_linux_test.go @@ -3,6 +3,7 @@ package system // import "github.com/docker/docker/integration/system" import ( + "context" "net/http" "testing" @@ -10,7 +11,6 @@ import ( req "github.com/docker/docker/internal/test/request" "github.com/gotestyourself/gotestyourself/assert" is "github.com/gotestyourself/gotestyourself/assert/cmp" - "golang.org/x/net/context" ) func TestInfoBinaryCommits(t *testing.T) { diff --git a/integration/system/info_test.go b/integration/system/info_test.go index 15aa22de8a..0906eea336 100644 --- a/integration/system/info_test.go +++ b/integration/system/info_test.go @@ -1,13 +1,13 @@ package system // import "github.com/docker/docker/integration/system" import ( + "context" "fmt" "testing" "github.com/docker/docker/internal/test/request" "github.com/gotestyourself/gotestyourself/assert" is "github.com/gotestyourself/gotestyourself/assert/cmp" - "golang.org/x/net/context" ) func TestInfoAPI(t *testing.T) { diff --git a/integration/system/login_test.go b/integration/system/login_test.go index 6956305f4a..5d512ca343 100644 --- a/integration/system/login_test.go +++ b/integration/system/login_test.go @@ -1,6 +1,7 @@ package system // import "github.com/docker/docker/integration/system" import ( + "context" "testing" "github.com/docker/docker/api/types" @@ -9,7 +10,6 @@ import ( "github.com/gotestyourself/gotestyourself/assert" is "github.com/gotestyourself/gotestyourself/assert/cmp" "github.com/gotestyourself/gotestyourself/skip" - "golang.org/x/net/context" ) // Test case for GitHub 22244 diff --git a/integration/system/version_test.go b/integration/system/version_test.go index 8892436fd2..2461805360 100644 --- a/integration/system/version_test.go +++ b/integration/system/version_test.go @@ -1,12 +1,12 @@ package system // import "github.com/docker/docker/integration/system" import ( + "context" "testing" "github.com/docker/docker/internal/test/request" "github.com/gotestyourself/gotestyourself/assert" is "github.com/gotestyourself/gotestyourself/assert/cmp" - "golang.org/x/net/context" ) func TestVersion(t *testing.T) { diff --git a/internal/test/environment/clean.go b/internal/test/environment/clean.go index fab8e7f6fb..8ef44e7075 100644 --- a/internal/test/environment/clean.go +++ b/internal/test/environment/clean.go @@ -1,6 +1,7 @@ package environment // import "github.com/docker/docker/internal/test/environment" import ( + "context" "regexp" "strings" @@ -9,7 +10,6 @@ import ( "github.com/docker/docker/client" "github.com/docker/docker/internal/test" "github.com/gotestyourself/gotestyourself/assert" - "golang.org/x/net/context" ) type testingT interface { diff --git a/internal/test/environment/environment.go b/internal/test/environment/environment.go index 39b0f11e6e..9aaabad7be 100644 --- a/internal/test/environment/environment.go +++ b/internal/test/environment/environment.go @@ -1,6 +1,7 @@ package environment // import "github.com/docker/docker/internal/test/environment" import ( + "context" "fmt" "os" "path/filepath" @@ -10,7 +11,6 @@ import ( "github.com/docker/docker/client" "github.com/docker/docker/internal/test/fixtures/load" "github.com/pkg/errors" - "golang.org/x/net/context" ) // Execution contains information about the current test execution and daemon diff --git a/internal/test/fixtures/load/frozen.go b/internal/test/fixtures/load/frozen.go index 576b48abbe..94f3680f95 100644 --- a/internal/test/fixtures/load/frozen.go +++ b/internal/test/fixtures/load/frozen.go @@ -3,14 +3,13 @@ package load // import "github.com/docker/docker/internal/test/fixtures/load" import ( "bufio" "bytes" + "context" "os" "os/exec" "path/filepath" "strings" "sync" - "context" - "github.com/docker/docker/api/types" "github.com/docker/docker/client" "github.com/docker/docker/pkg/jsonmessage" diff --git a/internal/test/fixtures/plugin/plugin.go b/internal/test/fixtures/plugin/plugin.go index ccfd83f138..523a261ad2 100644 --- a/internal/test/fixtures/plugin/plugin.go +++ b/internal/test/fixtures/plugin/plugin.go @@ -1,6 +1,7 @@ package plugin // import "github.com/docker/docker/internal/test/fixtures/plugin" import ( + "context" "encoding/json" "io" "io/ioutil" @@ -14,7 +15,6 @@ import ( "github.com/docker/docker/plugin" "github.com/docker/docker/registry" "github.com/pkg/errors" - "golang.org/x/net/context" ) // CreateOpt is is passed used to change the default plugin config before diff --git a/pkg/authorization/middleware.go b/pkg/authorization/middleware.go index 0e29eca3de..39c2dce856 100644 --- a/pkg/authorization/middleware.go +++ b/pkg/authorization/middleware.go @@ -1,12 +1,12 @@ package authorization // import "github.com/docker/docker/pkg/authorization" import ( + "context" "net/http" "sync" "github.com/docker/docker/pkg/plugingetter" "github.com/sirupsen/logrus" - "golang.org/x/net/context" ) // Middleware uses a list of plugins to diff --git a/pkg/authorization/middleware_unix_test.go b/pkg/authorization/middleware_unix_test.go index ddfe9d958f..6d1a428460 100644 --- a/pkg/authorization/middleware_unix_test.go +++ b/pkg/authorization/middleware_unix_test.go @@ -3,6 +3,7 @@ package authorization // import "github.com/docker/docker/pkg/authorization" import ( + "context" "net/http" "net/http/httptest" "testing" @@ -10,7 +11,6 @@ import ( "github.com/docker/docker/pkg/plugingetter" "github.com/gotestyourself/gotestyourself/assert" is "github.com/gotestyourself/gotestyourself/assert/cmp" - "golang.org/x/net/context" ) func TestMiddlewareWrapHandler(t *testing.T) { diff --git a/pkg/ioutils/readers.go b/pkg/ioutils/readers.go index 72f7f2319f..1f657bd3dc 100644 --- a/pkg/ioutils/readers.go +++ b/pkg/ioutils/readers.go @@ -1,11 +1,10 @@ package ioutils // import "github.com/docker/docker/pkg/ioutils" import ( + "context" "crypto/sha256" "encoding/hex" "io" - - "golang.org/x/net/context" ) // ReadCloserWrapper wraps an io.Reader, and implements an io.ReadCloser diff --git a/pkg/ioutils/readers_test.go b/pkg/ioutils/readers_test.go index a32e661210..e424054aa7 100644 --- a/pkg/ioutils/readers_test.go +++ b/pkg/ioutils/readers_test.go @@ -1,6 +1,7 @@ package ioutils // import "github.com/docker/docker/pkg/ioutils" import ( + "context" "fmt" "io/ioutil" "strings" @@ -9,7 +10,6 @@ import ( "github.com/gotestyourself/gotestyourself/assert" is "github.com/gotestyourself/gotestyourself/assert/cmp" - "golang.org/x/net/context" ) // Implement io.Reader diff --git a/plugin/backend_linux.go b/plugin/backend_linux.go index 000ee996dc..4a6d80d243 100644 --- a/plugin/backend_linux.go +++ b/plugin/backend_linux.go @@ -3,6 +3,7 @@ package plugin // import "github.com/docker/docker/plugin" import ( "archive/tar" "compress/gzip" + "context" "encoding/json" "io" "io/ioutil" @@ -36,7 +37,6 @@ import ( specs "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pkg/errors" "github.com/sirupsen/logrus" - "golang.org/x/net/context" ) var acceptedPluginFilterTags = map[string]bool{ diff --git a/plugin/backend_unsupported.go b/plugin/backend_unsupported.go index ac557c24c6..c0666e858e 100644 --- a/plugin/backend_unsupported.go +++ b/plugin/backend_unsupported.go @@ -3,6 +3,7 @@ package plugin // import "github.com/docker/docker/plugin" import ( + "context" "errors" "io" "net/http" @@ -10,7 +11,6 @@ import ( "github.com/docker/distribution/reference" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" - "golang.org/x/net/context" ) var errNotSupported = errors.New("plugins are not supported on this platform") diff --git a/plugin/blobstore.go b/plugin/blobstore.go index 82d6ce18e6..fd7f040efc 100644 --- a/plugin/blobstore.go +++ b/plugin/blobstore.go @@ -1,6 +1,7 @@ package plugin // import "github.com/docker/docker/plugin" import ( + "context" "fmt" "io" "io/ioutil" @@ -18,7 +19,6 @@ import ( specs "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pkg/errors" "github.com/sirupsen/logrus" - "golang.org/x/net/context" ) type blobstore interface { diff --git a/registry/service.go b/registry/service.go index 1d0a32104b..b441970ff1 100644 --- a/registry/service.go +++ b/registry/service.go @@ -1,14 +1,13 @@ package registry // import "github.com/docker/docker/registry" import ( + "context" "crypto/tls" "net/http" "net/url" "strings" "sync" - "golang.org/x/net/context" - "github.com/docker/distribution/reference" "github.com/docker/distribution/registry/client/auth" "github.com/docker/docker/api/types" |