From 67ca9d10cf2dd5408264020ae2b8e7f526be29ac Mon Sep 17 00:00:00 2001 From: Olivier Gambier Date: Tue, 23 Dec 2014 16:01:38 -0800 Subject: [PATCH] Move from docker-registry to distribution --- Dockerfile | 6 +++--- api/v2/descriptors.go | 4 ++-- api/v2/errors_test.go | 2 +- api/v2/urls.go | 2 +- api_test.go | 12 ++++++------ app.go | 12 ++++++------ app_test.go | 6 +++--- auth/silly/access.go | 2 +- auth/silly/access_test.go | 2 +- auth/token/accesscontroller.go | 4 ++-- auth/token/token.go | 4 ++-- auth/token/token_test.go | 4 ++-- auth/token/util.go | 2 +- client/client.go | 6 +++--- client/client_test.go | 6 +++--- client/errors.go | 2 +- client/objectstore.go | 4 ++-- client/pull.go | 2 +- client/push.go | 2 +- cmd/registry-api-descriptor-template/main.go | 2 +- cmd/registry-storagedriver-azure/main.go | 4 ++-- cmd/registry-storagedriver-filesystem/main.go | 4 ++-- cmd/registry-storagedriver-inmemory/main.go | 4 ++-- cmd/registry-storagedriver-s3/main.go | 4 ++-- cmd/registry/main.go | 12 ++++++------ context.go | 2 +- digest/digest.go | 2 +- digest/verifiers_test.go | 2 +- images.go | 6 +++--- layer.go | 6 +++--- layerupload.go | 6 +++--- storage/filereader.go | 2 +- storage/filereader_test.go | 4 ++-- storage/layer.go | 2 +- storage/layer_test.go | 8 ++++---- storage/layerreader.go | 2 +- storage/layerstore.go | 4 ++-- storage/layerupload.go | 4 ++-- storage/manifest.go | 2 +- storage/manifest_test.go | 4 ++-- storage/manifeststore.go | 2 +- storage/paths.go | 4 ++-- storage/paths_test.go | 2 +- storage/services.go | 4 ++-- storagedriver/azure/azure.go | 4 ++-- storagedriver/azure/azure_test.go | 4 ++-- storagedriver/factory/factory.go | 2 +- storagedriver/filesystem/driver.go | 4 ++-- storagedriver/filesystem/driver_test.go | 4 ++-- storagedriver/inmemory/driver.go | 4 ++-- storagedriver/inmemory/driver_test.go | 4 ++-- storagedriver/ipc/client.go | 2 +- storagedriver/ipc/ipc.go | 2 +- storagedriver/ipc/server.go | 2 +- storagedriver/s3/s3.go | 4 ++-- storagedriver/s3/s3_test.go | 4 ++-- storagedriver/testsuites/testsuites.go | 2 +- tags.go | 4 ++-- 58 files changed, 114 insertions(+), 114 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8ab4e7f8b..25f31529b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,10 @@ FROM golang -COPY . /go/src/github.com/docker/docker-registry +COPY . /go/src/github.com/docker/distribution # Fetch any dependencies to run the registry -RUN go get github.com/docker/docker-registry/... -RUN go install github.com/docker/docker-registry/cmd/registry +RUN go get github.com/docker/distribution/... +RUN go install github.com/docker/distribution/cmd/registry ENV CONFIG_PATH /etc/docker/registry/config.yml COPY ./cmd/registry/config.yml $CONFIG_PATH diff --git a/api/v2/descriptors.go b/api/v2/descriptors.go index b70575206..dfbbc6f90 100644 --- a/api/v2/descriptors.go +++ b/api/v2/descriptors.go @@ -4,8 +4,8 @@ import ( "net/http" "regexp" - "github.com/docker/docker-registry/common" - "github.com/docker/docker-registry/digest" + "github.com/docker/distribution/common" + "github.com/docker/distribution/digest" ) var ( diff --git a/api/v2/errors_test.go b/api/v2/errors_test.go index 70f3c2a95..9cc831c44 100644 --- a/api/v2/errors_test.go +++ b/api/v2/errors_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/docker/docker-registry/digest" + "github.com/docker/distribution/digest" ) // TestErrorCodes ensures that error code format, mappings and diff --git a/api/v2/urls.go b/api/v2/urls.go index 72f44299a..47c7beab5 100644 --- a/api/v2/urls.go +++ b/api/v2/urls.go @@ -4,7 +4,7 @@ import ( "net/http" "net/url" - "github.com/docker/docker-registry/digest" + "github.com/docker/distribution/digest" "github.com/gorilla/mux" ) diff --git a/api_test.go b/api_test.go index 6cf563441..76c3b3484 100644 --- a/api_test.go +++ b/api_test.go @@ -13,12 +13,12 @@ import ( "os" "testing" - "github.com/docker/docker-registry/api/v2" - "github.com/docker/docker-registry/common/testutil" - "github.com/docker/docker-registry/configuration" - "github.com/docker/docker-registry/digest" - "github.com/docker/docker-registry/storage" - _ "github.com/docker/docker-registry/storagedriver/inmemory" + "github.com/docker/distribution/api/v2" + "github.com/docker/distribution/common/testutil" + "github.com/docker/distribution/configuration" + "github.com/docker/distribution/digest" + "github.com/docker/distribution/storage" + _ "github.com/docker/distribution/storagedriver/inmemory" "github.com/docker/libtrust" "github.com/gorilla/handlers" ) diff --git a/app.go b/app.go index 5f1fe52d1..d8276ceca 100644 --- a/app.go +++ b/app.go @@ -4,12 +4,12 @@ import ( "fmt" "net/http" - "github.com/docker/docker-registry/api/v2" - "github.com/docker/docker-registry/auth" - "github.com/docker/docker-registry/configuration" - "github.com/docker/docker-registry/storage" - "github.com/docker/docker-registry/storagedriver" - "github.com/docker/docker-registry/storagedriver/factory" + "github.com/docker/distribution/api/v2" + "github.com/docker/distribution/auth" + "github.com/docker/distribution/configuration" + "github.com/docker/distribution/storage" + "github.com/docker/distribution/storagedriver" + "github.com/docker/distribution/storagedriver/factory" log "github.com/Sirupsen/logrus" "github.com/gorilla/mux" diff --git a/app_test.go b/app_test.go index b8edbd642..d3d6d9798 100644 --- a/app_test.go +++ b/app_test.go @@ -7,9 +7,9 @@ import ( "net/url" "testing" - "github.com/docker/docker-registry/api/v2" - _ "github.com/docker/docker-registry/auth/silly" - "github.com/docker/docker-registry/configuration" + "github.com/docker/distribution/api/v2" + _ "github.com/docker/distribution/auth/silly" + "github.com/docker/distribution/configuration" ) // TestAppDispatcher builds an application with a test dispatcher and ensures diff --git a/auth/silly/access.go b/auth/silly/access.go index 4995d0dcd..f65231ba7 100644 --- a/auth/silly/access.go +++ b/auth/silly/access.go @@ -12,7 +12,7 @@ import ( "net/http" "strings" - "github.com/docker/docker-registry/auth" + "github.com/docker/distribution/auth" ) // accessController provides a simple implementation of auth.AccessController diff --git a/auth/silly/access_test.go b/auth/silly/access_test.go index a412c1017..2469aa999 100644 --- a/auth/silly/access_test.go +++ b/auth/silly/access_test.go @@ -5,7 +5,7 @@ import ( "net/http/httptest" "testing" - "github.com/docker/docker-registry/auth" + "github.com/docker/distribution/auth" ) func TestSillyAccessController(t *testing.T) { diff --git a/auth/token/accesscontroller.go b/auth/token/accesscontroller.go index b9ee57718..ca92861ef 100644 --- a/auth/token/accesscontroller.go +++ b/auth/token/accesscontroller.go @@ -13,8 +13,8 @@ import ( "github.com/docker/libtrust" - "github.com/docker/docker-registry/auth" - "github.com/docker/docker-registry/common" + "github.com/docker/distribution/auth" + "github.com/docker/distribution/common" ) // accessSet maps a typed, named resource to diff --git a/auth/token/token.go b/auth/token/token.go index 8752afae1..cdbf71073 100644 --- a/auth/token/token.go +++ b/auth/token/token.go @@ -13,8 +13,8 @@ import ( log "github.com/Sirupsen/logrus" "github.com/docker/libtrust" - "github.com/docker/docker-registry/auth" - "github.com/docker/docker-registry/common" + "github.com/docker/distribution/auth" + "github.com/docker/distribution/common" ) const ( diff --git a/auth/token/token_test.go b/auth/token/token_test.go index 13d7cedec..9c8ab6cb7 100644 --- a/auth/token/token_test.go +++ b/auth/token/token_test.go @@ -17,8 +17,8 @@ import ( "github.com/docker/libtrust" - "github.com/docker/docker-registry/auth" - "github.com/docker/docker-registry/common" + "github.com/docker/distribution/auth" + "github.com/docker/distribution/common" ) func makeRootKeys(numKeys int) ([]libtrust.PrivateKey, error) { diff --git a/auth/token/util.go b/auth/token/util.go index 7ec52cef8..8aa46bac0 100644 --- a/auth/token/util.go +++ b/auth/token/util.go @@ -5,7 +5,7 @@ import ( "errors" "strings" - "github.com/docker/docker-registry/common" + "github.com/docker/distribution/common" ) // joseBase64UrlEncode encodes the given data using the standard base64 url diff --git a/client/client.go b/client/client.go index 6616e54d6..d13d6f21f 100644 --- a/client/client.go +++ b/client/client.go @@ -10,9 +10,9 @@ import ( "regexp" "strconv" - "github.com/docker/docker-registry/api/v2" - "github.com/docker/docker-registry/digest" - "github.com/docker/docker-registry/storage" + "github.com/docker/distribution/api/v2" + "github.com/docker/distribution/digest" + "github.com/docker/distribution/storage" ) // Client implements the client interface to the registry http api diff --git a/client/client_test.go b/client/client_test.go index 0b4d023bf..bc8818319 100644 --- a/client/client_test.go +++ b/client/client_test.go @@ -9,9 +9,9 @@ import ( "sync" "testing" - "github.com/docker/docker-registry/common/testutil" - "github.com/docker/docker-registry/digest" - "github.com/docker/docker-registry/storage" + "github.com/docker/distribution/common/testutil" + "github.com/docker/distribution/digest" + "github.com/docker/distribution/storage" ) type testBlob struct { diff --git a/client/errors.go b/client/errors.go index 9bb2e40f8..3e89e674f 100644 --- a/client/errors.go +++ b/client/errors.go @@ -3,7 +3,7 @@ package client import ( "fmt" - "github.com/docker/docker-registry/digest" + "github.com/docker/distribution/digest" ) // RepositoryNotFoundError is returned when making an operation against a diff --git a/client/objectstore.go b/client/objectstore.go index 55ab20a55..5df7f6992 100644 --- a/client/objectstore.go +++ b/client/objectstore.go @@ -6,8 +6,8 @@ import ( "io" "sync" - "github.com/docker/docker-registry/digest" - "github.com/docker/docker-registry/storage" + "github.com/docker/distribution/digest" + "github.com/docker/distribution/storage" ) var ( diff --git a/client/pull.go b/client/pull.go index 192a84bca..c7f3c25c5 100644 --- a/client/pull.go +++ b/client/pull.go @@ -4,7 +4,7 @@ import ( "fmt" "io" - "github.com/docker/docker-registry/storage" + "github.com/docker/distribution/storage" log "github.com/Sirupsen/logrus" ) diff --git a/client/push.go b/client/push.go index aac3fc401..7626cd16a 100644 --- a/client/push.go +++ b/client/push.go @@ -4,7 +4,7 @@ import ( "fmt" log "github.com/Sirupsen/logrus" - "github.com/docker/docker-registry/storage" + "github.com/docker/distribution/storage" ) // simultaneousLayerPushWindow is the size of the parallel layer push window. diff --git a/cmd/registry-api-descriptor-template/main.go b/cmd/registry-api-descriptor-template/main.go index 07b955a2e..5e2e71d70 100644 --- a/cmd/registry-api-descriptor-template/main.go +++ b/cmd/registry-api-descriptor-template/main.go @@ -20,7 +20,7 @@ import ( "regexp" "text/template" - "github.com/docker/docker-registry/api/v2" + "github.com/docker/distribution/api/v2" ) var spaceRegex = regexp.MustCompile(`\n\s*`) diff --git a/cmd/registry-storagedriver-azure/main.go b/cmd/registry-storagedriver-azure/main.go index 584699bf6..17881b50e 100644 --- a/cmd/registry-storagedriver-azure/main.go +++ b/cmd/registry-storagedriver-azure/main.go @@ -7,8 +7,8 @@ import ( "os" log "github.com/Sirupsen/logrus" - "github.com/docker/docker-registry/storagedriver/azure" - "github.com/docker/docker-registry/storagedriver/ipc" + "github.com/docker/distribution/storagedriver/azure" + "github.com/docker/distribution/storagedriver/ipc" ) // An out-of-process Azure Storage driver, intended to be run by ipc.NewDriverClient diff --git a/cmd/registry-storagedriver-filesystem/main.go b/cmd/registry-storagedriver-filesystem/main.go index 0e555b610..2ad6d82e7 100644 --- a/cmd/registry-storagedriver-filesystem/main.go +++ b/cmd/registry-storagedriver-filesystem/main.go @@ -8,8 +8,8 @@ import ( "github.com/Sirupsen/logrus" - "github.com/docker/docker-registry/storagedriver/filesystem" - "github.com/docker/docker-registry/storagedriver/ipc" + "github.com/docker/distribution/storagedriver/filesystem" + "github.com/docker/distribution/storagedriver/ipc" ) // An out-of-process filesystem driver, intended to be run by ipc.NewDriverClient diff --git a/cmd/registry-storagedriver-inmemory/main.go b/cmd/registry-storagedriver-inmemory/main.go index b75d36947..ef6fabe49 100644 --- a/cmd/registry-storagedriver-inmemory/main.go +++ b/cmd/registry-storagedriver-inmemory/main.go @@ -4,8 +4,8 @@ package main import ( "github.com/Sirupsen/logrus" - "github.com/docker/docker-registry/storagedriver/inmemory" - "github.com/docker/docker-registry/storagedriver/ipc" + "github.com/docker/distribution/storagedriver/inmemory" + "github.com/docker/distribution/storagedriver/ipc" ) // An out-of-process inmemory driver, intended to be run by ipc.NewDriverClient diff --git a/cmd/registry-storagedriver-s3/main.go b/cmd/registry-storagedriver-s3/main.go index e2234b7b9..be49f1576 100644 --- a/cmd/registry-storagedriver-s3/main.go +++ b/cmd/registry-storagedriver-s3/main.go @@ -8,8 +8,8 @@ import ( "github.com/Sirupsen/logrus" - "github.com/docker/docker-registry/storagedriver/ipc" - "github.com/docker/docker-registry/storagedriver/s3" + "github.com/docker/distribution/storagedriver/ipc" + "github.com/docker/distribution/storagedriver/s3" ) // An out-of-process S3 driver, intended to be run by ipc.NewDriverClient diff --git a/cmd/registry/main.go b/cmd/registry/main.go index ea20a9165..1bf635cc2 100644 --- a/cmd/registry/main.go +++ b/cmd/registry/main.go @@ -12,12 +12,12 @@ import ( "github.com/gorilla/handlers" "github.com/yvasiyarov/gorelic" - "github.com/docker/docker-registry" - _ "github.com/docker/docker-registry/auth/silly" - _ "github.com/docker/docker-registry/auth/token" - "github.com/docker/docker-registry/configuration" - _ "github.com/docker/docker-registry/storagedriver/filesystem" - _ "github.com/docker/docker-registry/storagedriver/inmemory" + "github.com/docker/distribution" + _ "github.com/docker/distribution/auth/silly" + _ "github.com/docker/distribution/auth/token" + "github.com/docker/distribution/configuration" + _ "github.com/docker/distribution/storagedriver/filesystem" + _ "github.com/docker/distribution/storagedriver/inmemory" ) func main() { diff --git a/context.go b/context.go index 0c5ba5870..88193cda0 100644 --- a/context.go +++ b/context.go @@ -2,7 +2,7 @@ package registry import ( "github.com/Sirupsen/logrus" - "github.com/docker/docker-registry/api/v2" + "github.com/docker/distribution/api/v2" ) // Context should contain the request specific context for use in across diff --git a/digest/digest.go b/digest/digest.go index 08abba5ca..dcf6bc910 100644 --- a/digest/digest.go +++ b/digest/digest.go @@ -10,7 +10,7 @@ import ( "regexp" "strings" - "github.com/docker/docker-registry/common" + "github.com/docker/distribution/common" "github.com/docker/docker/pkg/tarsum" ) diff --git a/digest/verifiers_test.go b/digest/verifiers_test.go index fb176cc1a..5d595ec14 100644 --- a/digest/verifiers_test.go +++ b/digest/verifiers_test.go @@ -7,7 +7,7 @@ import ( "os" "testing" - "github.com/docker/docker-registry/common/testutil" + "github.com/docker/distribution/common/testutil" ) func TestDigestVerifier(t *testing.T) { diff --git a/images.go b/images.go index 5a373f1f6..6a9721091 100644 --- a/images.go +++ b/images.go @@ -5,9 +5,9 @@ import ( "fmt" "net/http" - "github.com/docker/docker-registry/api/v2" - "github.com/docker/docker-registry/digest" - "github.com/docker/docker-registry/storage" + "github.com/docker/distribution/api/v2" + "github.com/docker/distribution/digest" + "github.com/docker/distribution/storage" "github.com/gorilla/handlers" ) diff --git a/layer.go b/layer.go index 094a54cf4..a7c46c31e 100644 --- a/layer.go +++ b/layer.go @@ -3,9 +3,9 @@ package registry import ( "net/http" - "github.com/docker/docker-registry/api/v2" - "github.com/docker/docker-registry/digest" - "github.com/docker/docker-registry/storage" + "github.com/docker/distribution/api/v2" + "github.com/docker/distribution/digest" + "github.com/docker/distribution/storage" "github.com/gorilla/handlers" ) diff --git a/layerupload.go b/layerupload.go index 91c3b5ccd..49b10789d 100644 --- a/layerupload.go +++ b/layerupload.go @@ -7,9 +7,9 @@ import ( "strconv" "github.com/Sirupsen/logrus" - "github.com/docker/docker-registry/api/v2" - "github.com/docker/docker-registry/digest" - "github.com/docker/docker-registry/storage" + "github.com/docker/distribution/api/v2" + "github.com/docker/distribution/digest" + "github.com/docker/distribution/storage" "github.com/gorilla/handlers" ) diff --git a/storage/filereader.go b/storage/filereader.go index bcc2614ef..9a6eb2b37 100644 --- a/storage/filereader.go +++ b/storage/filereader.go @@ -7,7 +7,7 @@ import ( "os" "time" - "github.com/docker/docker-registry/storagedriver" + "github.com/docker/distribution/storagedriver" ) // remoteFileReader provides a read seeker interface to files stored in diff --git a/storage/filereader_test.go b/storage/filereader_test.go index cfc9d215d..7cf5633d3 100644 --- a/storage/filereader_test.go +++ b/storage/filereader_test.go @@ -8,9 +8,9 @@ import ( "os" "testing" - "github.com/docker/docker-registry/digest" + "github.com/docker/distribution/digest" - "github.com/docker/docker-registry/storagedriver/inmemory" + "github.com/docker/distribution/storagedriver/inmemory" ) func TestSimpleRead(t *testing.T) { diff --git a/storage/layer.go b/storage/layer.go index 84f83d2de..4bb6699ca 100644 --- a/storage/layer.go +++ b/storage/layer.go @@ -5,7 +5,7 @@ import ( "io" "time" - "github.com/docker/docker-registry/digest" + "github.com/docker/distribution/digest" ) // Layer provides a readable and seekable layer object. Typically, diff --git a/storage/layer_test.go b/storage/layer_test.go index ba92d2deb..166d803a7 100644 --- a/storage/layer_test.go +++ b/storage/layer_test.go @@ -9,10 +9,10 @@ import ( "os" "testing" - "github.com/docker/docker-registry/common/testutil" - "github.com/docker/docker-registry/digest" - "github.com/docker/docker-registry/storagedriver" - "github.com/docker/docker-registry/storagedriver/inmemory" + "github.com/docker/distribution/common/testutil" + "github.com/docker/distribution/digest" + "github.com/docker/distribution/storagedriver" + "github.com/docker/distribution/storagedriver/inmemory" ) // TestSimpleLayerUpload covers the layer upload process, exercising common diff --git a/storage/layerreader.go b/storage/layerreader.go index fa2275d92..4510dd7d0 100644 --- a/storage/layerreader.go +++ b/storage/layerreader.go @@ -3,7 +3,7 @@ package storage import ( "time" - "github.com/docker/docker-registry/digest" + "github.com/docker/distribution/digest" ) // layerReadSeeker implements Layer and provides facilities for reading and diff --git a/storage/layerstore.go b/storage/layerstore.go index ddebdbcce..7b5e05f73 100644 --- a/storage/layerstore.go +++ b/storage/layerstore.go @@ -1,8 +1,8 @@ package storage import ( - "github.com/docker/docker-registry/digest" - "github.com/docker/docker-registry/storagedriver" + "github.com/docker/distribution/digest" + "github.com/docker/distribution/storagedriver" ) type layerStore struct { diff --git a/storage/layerupload.go b/storage/layerupload.go index 63ae5d6f6..0754a7e2d 100644 --- a/storage/layerupload.go +++ b/storage/layerupload.go @@ -9,8 +9,8 @@ import ( "code.google.com/p/go-uuid/uuid" - "github.com/docker/docker-registry/digest" - "github.com/docker/docker-registry/storagedriver" + "github.com/docker/distribution/digest" + "github.com/docker/distribution/storagedriver" "github.com/docker/docker/pkg/tarsum" "io" diff --git a/storage/manifest.go b/storage/manifest.go index 88782c533..be70a868f 100644 --- a/storage/manifest.go +++ b/storage/manifest.go @@ -5,7 +5,7 @@ import ( "encoding/json" "github.com/Sirupsen/logrus" - "github.com/docker/docker-registry/digest" + "github.com/docker/distribution/digest" "github.com/docker/libtrust" ) diff --git a/storage/manifest_test.go b/storage/manifest_test.go index ea634df8d..3bfee2ddf 100644 --- a/storage/manifest_test.go +++ b/storage/manifest_test.go @@ -6,8 +6,8 @@ import ( "github.com/docker/libtrust" - "github.com/docker/docker-registry/digest" - "github.com/docker/docker-registry/storagedriver/inmemory" + "github.com/docker/distribution/digest" + "github.com/docker/distribution/storagedriver/inmemory" ) func TestManifestStorage(t *testing.T) { diff --git a/storage/manifeststore.go b/storage/manifeststore.go index 69a48d5f7..25e55107d 100644 --- a/storage/manifeststore.go +++ b/storage/manifeststore.go @@ -6,7 +6,7 @@ import ( "path" "strings" - "github.com/docker/docker-registry/storagedriver" + "github.com/docker/distribution/storagedriver" "github.com/docker/libtrust" ) diff --git a/storage/paths.go b/storage/paths.go index a3538b855..9a61e0815 100644 --- a/storage/paths.go +++ b/storage/paths.go @@ -5,8 +5,8 @@ import ( "path" "strings" - "github.com/docker/docker-registry/common" - "github.com/docker/docker-registry/digest" + "github.com/docker/distribution/common" + "github.com/docker/distribution/digest" ) const storagePathVersion = "v2" diff --git a/storage/paths_test.go b/storage/paths_test.go index 33681f392..7b91865f7 100644 --- a/storage/paths_test.go +++ b/storage/paths_test.go @@ -3,7 +3,7 @@ package storage import ( "testing" - "github.com/docker/docker-registry/digest" + "github.com/docker/distribution/digest" ) func TestPathMapper(t *testing.T) { diff --git a/storage/services.go b/storage/services.go index da6d88c5d..ed33f936f 100644 --- a/storage/services.go +++ b/storage/services.go @@ -1,8 +1,8 @@ package storage import ( - "github.com/docker/docker-registry/digest" - "github.com/docker/docker-registry/storagedriver" + "github.com/docker/distribution/digest" + "github.com/docker/distribution/storagedriver" ) // Services provides various services with application-level operations for diff --git a/storagedriver/azure/azure.go b/storagedriver/azure/azure.go index 64402f3b1..ee3230ff7 100644 --- a/storagedriver/azure/azure.go +++ b/storagedriver/azure/azure.go @@ -13,8 +13,8 @@ import ( "strconv" "strings" - "github.com/docker/docker-registry/storagedriver" - "github.com/docker/docker-registry/storagedriver/factory" + "github.com/docker/distribution/storagedriver" + "github.com/docker/distribution/storagedriver/factory" azure "github.com/MSOpenTech/azure-sdk-for-go/clients/storage" ) diff --git a/storagedriver/azure/azure_test.go b/storagedriver/azure/azure_test.go index 1edcc1ea8..4e8ac59de 100644 --- a/storagedriver/azure/azure_test.go +++ b/storagedriver/azure/azure_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - "github.com/docker/docker-registry/storagedriver" - "github.com/docker/docker-registry/storagedriver/testsuites" + "github.com/docker/distribution/storagedriver" + "github.com/docker/distribution/storagedriver/testsuites" . "gopkg.in/check.v1" ) diff --git a/storagedriver/factory/factory.go b/storagedriver/factory/factory.go index 254cd9bb2..ba3b7dfac 100644 --- a/storagedriver/factory/factory.go +++ b/storagedriver/factory/factory.go @@ -3,7 +3,7 @@ package factory import ( "fmt" - "github.com/docker/docker-registry/storagedriver" + "github.com/docker/distribution/storagedriver" ) // driverFactories stores an internal mapping between storage driver names and their respective diff --git a/storagedriver/filesystem/driver.go b/storagedriver/filesystem/driver.go index edc94d394..7307eae76 100644 --- a/storagedriver/filesystem/driver.go +++ b/storagedriver/filesystem/driver.go @@ -9,8 +9,8 @@ import ( "path" "time" - "github.com/docker/docker-registry/storagedriver" - "github.com/docker/docker-registry/storagedriver/factory" + "github.com/docker/distribution/storagedriver" + "github.com/docker/distribution/storagedriver/factory" ) const driverName = "filesystem" diff --git a/storagedriver/filesystem/driver_test.go b/storagedriver/filesystem/driver_test.go index 0965daa47..08b203bd4 100644 --- a/storagedriver/filesystem/driver_test.go +++ b/storagedriver/filesystem/driver_test.go @@ -5,8 +5,8 @@ import ( "os" "testing" - "github.com/docker/docker-registry/storagedriver" - "github.com/docker/docker-registry/storagedriver/testsuites" + "github.com/docker/distribution/storagedriver" + "github.com/docker/distribution/storagedriver/testsuites" . "gopkg.in/check.v1" ) diff --git a/storagedriver/inmemory/driver.go b/storagedriver/inmemory/driver.go index 2e23c7588..d56ea3a4f 100644 --- a/storagedriver/inmemory/driver.go +++ b/storagedriver/inmemory/driver.go @@ -8,8 +8,8 @@ import ( "sync" "time" - "github.com/docker/docker-registry/storagedriver" - "github.com/docker/docker-registry/storagedriver/factory" + "github.com/docker/distribution/storagedriver" + "github.com/docker/distribution/storagedriver/factory" ) const driverName = "inmemory" diff --git a/storagedriver/inmemory/driver_test.go b/storagedriver/inmemory/driver_test.go index 6a4b36973..1034422ee 100644 --- a/storagedriver/inmemory/driver_test.go +++ b/storagedriver/inmemory/driver_test.go @@ -3,8 +3,8 @@ package inmemory import ( "testing" - "github.com/docker/docker-registry/storagedriver" - "github.com/docker/docker-registry/storagedriver/testsuites" + "github.com/docker/distribution/storagedriver" + "github.com/docker/distribution/storagedriver/testsuites" "gopkg.in/check.v1" ) diff --git a/storagedriver/ipc/client.go b/storagedriver/ipc/client.go index 2dc5c44e3..fcb5c4625 100644 --- a/storagedriver/ipc/client.go +++ b/storagedriver/ipc/client.go @@ -13,7 +13,7 @@ import ( "os/exec" "syscall" - "github.com/docker/docker-registry/storagedriver" + "github.com/docker/distribution/storagedriver" "github.com/docker/libchan" "github.com/docker/libchan/spdy" ) diff --git a/storagedriver/ipc/ipc.go b/storagedriver/ipc/ipc.go index 45c546597..e7ddd69e7 100644 --- a/storagedriver/ipc/ipc.go +++ b/storagedriver/ipc/ipc.go @@ -7,7 +7,7 @@ import ( "io" "reflect" - "github.com/docker/docker-registry/storagedriver" + "github.com/docker/distribution/storagedriver" "github.com/docker/libchan" ) diff --git a/storagedriver/ipc/server.go b/storagedriver/ipc/server.go index fa0077a8c..6d7df2eb7 100644 --- a/storagedriver/ipc/server.go +++ b/storagedriver/ipc/server.go @@ -10,7 +10,7 @@ import ( "os" "reflect" - "github.com/docker/docker-registry/storagedriver" + "github.com/docker/distribution/storagedriver" "github.com/docker/libchan" "github.com/docker/libchan/spdy" ) diff --git a/storagedriver/s3/s3.go b/storagedriver/s3/s3.go index b8a905c34..9e03b9e71 100644 --- a/storagedriver/s3/s3.go +++ b/storagedriver/s3/s3.go @@ -26,8 +26,8 @@ import ( "github.com/crowdmob/goamz/aws" "github.com/crowdmob/goamz/s3" - "github.com/docker/docker-registry/storagedriver" - "github.com/docker/docker-registry/storagedriver/factory" + "github.com/docker/distribution/storagedriver" + "github.com/docker/distribution/storagedriver/factory" ) const driverName = "s3" diff --git a/storagedriver/s3/s3_test.go b/storagedriver/s3/s3_test.go index 32af24ab2..aaf7e5bdb 100644 --- a/storagedriver/s3/s3_test.go +++ b/storagedriver/s3/s3_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/crowdmob/goamz/aws" - "github.com/docker/docker-registry/storagedriver" - "github.com/docker/docker-registry/storagedriver/testsuites" + "github.com/docker/distribution/storagedriver" + "github.com/docker/distribution/storagedriver/testsuites" "gopkg.in/check.v1" ) diff --git a/storagedriver/testsuites/testsuites.go b/storagedriver/testsuites/testsuites.go index 25a066f37..24fd582cb 100644 --- a/storagedriver/testsuites/testsuites.go +++ b/storagedriver/testsuites/testsuites.go @@ -13,7 +13,7 @@ import ( "testing" "time" - "github.com/docker/docker-registry/storagedriver" + "github.com/docker/distribution/storagedriver" "gopkg.in/check.v1" ) diff --git a/tags.go b/tags.go index 04d994b97..458e6d1a1 100644 --- a/tags.go +++ b/tags.go @@ -4,8 +4,8 @@ import ( "encoding/json" "net/http" - "github.com/docker/docker-registry/api/v2" - "github.com/docker/docker-registry/storage" + "github.com/docker/distribution/api/v2" + "github.com/docker/distribution/storage" "github.com/gorilla/handlers" )