summaryrefslogtreecommitdiff
path: root/registry/service.go
diff options
context:
space:
mode:
authorKir Kolyshkin <kolyshkin@gmail.com>2018-04-19 15:30:59 -0700
committerKir Kolyshkin <kolyshkin@gmail.com>2018-04-23 13:52:44 -0700
commit7d62e40f7e4f3c17d229a7687d6fcca5448de813 (patch)
treedbba5821b6d9b9f9bdd414248bfbfcff932b77cb /registry/service.go
parent5c233cf4315747785b27d4b0f0631d220556205f (diff)
downloaddocker-7d62e40f7e4f3c17d229a7687d6fcca5448de813.tar.gz
Switch from x/net/context -> context
Since Go 1.7, context is a standard package. Since Go 1.9, everything that is provided by "x/net/context" is a couple of type aliases to types in "context". Many vendored packages still use x/net/context, so vendor entry remains for now. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Diffstat (limited to 'registry/service.go')
-rw-r--r--registry/service.go3
1 files changed, 1 insertions, 2 deletions
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"