vbatts/registry
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

go.mod: change imports to github.com/distribution/distribution/v3

Browse source 
Go 1.13 and up enforce import paths to be versioned if a project
contains a go.mod and has released v2 or up.

The current v2.x branches (and releases) do not yet have a go.mod,
and therefore are still allowed to be imported with a non-versioned
import path (go modules add a `+incompatible` annotation in that case).

However, now that this project has a `go.mod` file, incompatible
import paths will not be accepted by go modules, and attempting
to use code from this repository will fail.

This patch uses `v3` for the import-paths (not `v2`), because changing
import paths itself is a breaking change, which means that  the
next release should increment the "major" version to comply with
SemVer (as go modules dictate).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2020-08-24 13:18:39 +02:00
parent 6200038bc7
commit 1d33874951
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
173 changed files with 527 additions and 527 deletions
Download patch file Download diff file Expand all files Collapse all files

4
registry/api/v2/descriptors.go
View file

@ -4,8 +4,8 @@ import (
"net/http"
"regexp"
"github.com/docker/distribution/reference"
"github.com/docker/distribution/registry/api/errcode"
"github.com/distribution/distribution/v3/reference"
"github.com/distribution/distribution/v3/registry/api/errcode"
"github.com/opencontainers/go-digest"
)

2
registry/api/v2/errors.go
View file

@ -3,7 +3,7 @@ package v2
import (
"net/http"
"github.com/docker/distribution/registry/api/errcode"
"github.com/distribution/distribution/v3/registry/api/errcode"
)
const errGroup = "registry.api.v2"

2
registry/api/v2/urls.go
View file

@ -6,7 +6,7 @@ import (
"net/url"
"strings"
"github.com/docker/distribution/reference"
"github.com/distribution/distribution/v3/reference"
"github.com/gorilla/mux"
)

2
registry/api/v2/urls_test.go
View file

@ -7,7 +7,7 @@ import (
"reflect"
"testing"
"github.com/docker/distribution/reference"
"github.com/distribution/distribution/v3/reference"
)
type urlBuilderTestCase struct {

4
registry/auth/htpasswd/access.go
View file

@ -18,8 +18,8 @@ import (
"golang.org/x/crypto/bcrypt"
dcontext "github.com/docker/distribution/context"
"github.com/docker/distribution/registry/auth"
dcontext "github.com/distribution/distribution/v3/context"
"github.com/distribution/distribution/v3/registry/auth"
)
type accessController struct {

4
registry/auth/htpasswd/access_test.go
View file

@ -8,8 +8,8 @@ import (
"os"
"testing"
"github.com/docker/distribution/context"
"github.com/docker/distribution/registry/auth"
"github.com/distribution/distribution/v3/context"
"github.com/distribution/distribution/v3/registry/auth"
)
func TestBasicAccessController(t *testing.T) {

2
registry/auth/htpasswd/htpasswd.go
View file

@ -6,7 +6,7 @@ import (
"io"
"strings"
"github.com/docker/distribution/registry/auth"
"github.com/distribution/distribution/v3/registry/auth"
"golang.org/x/crypto/bcrypt"
)

4
registry/auth/silly/access.go
View file

@ -13,8 +13,8 @@ import (
"net/http"
"strings"
dcontext "github.com/docker/distribution/context"
"github.com/docker/distribution/registry/auth"
dcontext "github.com/distribution/distribution/v3/context"
"github.com/distribution/distribution/v3/registry/auth"
)
// accessController provides a simple implementation of auth.AccessController

4
registry/auth/silly/access_test.go
View file

@ -5,8 +5,8 @@ import (
"net/http/httptest"
"testing"
"github.com/docker/distribution/context"
"github.com/docker/distribution/registry/auth"
"github.com/distribution/distribution/v3/context"
"github.com/distribution/distribution/v3/registry/auth"
)
func TestSillyAccessController(t *testing.T) {

4
registry/auth/token/accesscontroller.go
View file

@ -12,8 +12,8 @@ import (
"os"
"strings"
dcontext "github.com/docker/distribution/context"
"github.com/docker/distribution/registry/auth"
dcontext "github.com/distribution/distribution/v3/context"
"github.com/distribution/distribution/v3/registry/auth"
"github.com/docker/libtrust"
)

2
registry/auth/token/token.go
View file

@ -13,7 +13,7 @@ import (
"github.com/docker/libtrust"
log "github.com/sirupsen/logrus"
"github.com/docker/distribution/registry/auth"
"github.com/distribution/distribution/v3/registry/auth"
)
const (

4
registry/auth/token/token_test.go
View file

@ -15,8 +15,8 @@ import (
"testing"
"time"
"github.com/docker/distribution/context"
"github.com/docker/distribution/registry/auth"
"github.com/distribution/distribution/v3/context"
"github.com/distribution/distribution/v3/registry/auth"
"github.com/docker/libtrust"
)

6
registry/client/auth/session.go
View file

@ -10,9 +10,9 @@ import (
"sync"
"time"
"github.com/docker/distribution/registry/client"
"github.com/docker/distribution/registry/client/auth/challenge"
"github.com/docker/distribution/registry/client/transport"
"github.com/distribution/distribution/v3/registry/client"
"github.com/distribution/distribution/v3/registry/client/auth/challenge"
"github.com/distribution/distribution/v3/registry/client/transport"
)
var (

6
registry/client/auth/session_test.go
View file

@ -9,9 +9,9 @@ import (
"testing"
"time"
"github.com/docker/distribution/registry/client/auth/challenge"
"github.com/docker/distribution/registry/client/transport"
"github.com/docker/distribution/testutil"
"github.com/distribution/distribution/v3/registry/client/auth/challenge"
"github.com/distribution/distribution/v3/registry/client/transport"
"github.com/distribution/distribution/v3/testutil"
)
// An implementation of clock for providing fake time data.

2
registry/client/blob_writer.go
View file

@ -9,7 +9,7 @@ import (
"net/http"
"time"
"github.com/docker/distribution"
"github.com/distribution/distribution/v3"
)
type httpBlobUpload struct {

8
registry/client/blob_writer_test.go
View file

@ -6,10 +6,10 @@ import (
"net/http"
"testing"
"github.com/docker/distribution"
"github.com/docker/distribution/registry/api/errcode"
v2 "github.com/docker/distribution/registry/api/v2"
"github.com/docker/distribution/testutil"
"github.com/distribution/distribution/v3"
"github.com/distribution/distribution/v3/registry/api/errcode"
v2 "github.com/distribution/distribution/v3/registry/api/v2"
"github.com/distribution/distribution/v3/testutil"
)
// Test implements distribution.BlobWriter

4
registry/client/errors.go
View file

@ -8,8 +8,8 @@ import (
"io/ioutil"
"net/http"
"github.com/docker/distribution/registry/api/errcode"
"github.com/docker/distribution/registry/client/auth/challenge"
"github.com/distribution/distribution/v3/registry/api/errcode"
"github.com/distribution/distribution/v3/registry/client/auth/challenge"
)
// ErrNoErrorsInBody is returned when an HTTP response body parses to an empty

12
registry/client/repository.go
View file

@ -14,12 +14,12 @@ import (
"strings"
"time"
"github.com/docker/distribution"
"github.com/docker/distribution/reference"
v2 "github.com/docker/distribution/registry/api/v2"
"github.com/docker/distribution/registry/client/transport"
"github.com/docker/distribution/registry/storage/cache"
"github.com/docker/distribution/registry/storage/cache/memory"
"github.com/distribution/distribution/v3"
"github.com/distribution/distribution/v3/reference"
v2 "github.com/distribution/distribution/v3/registry/api/v2"
"github.com/distribution/distribution/v3/registry/client/transport"
"github.com/distribution/distribution/v3/registry/storage/cache"
"github.com/distribution/distribution/v3/registry/storage/cache/memory"
"github.com/opencontainers/go-digest"
)

18
registry/client/repository_test.go
View file

@ -17,15 +17,15 @@ import (
"testing"
"time"
"github.com/docker/distribution"
"github.com/docker/distribution/context"
"github.com/docker/distribution/manifest"
"github.com/docker/distribution/manifest/schema1"
"github.com/docker/distribution/reference"
"github.com/docker/distribution/registry/api/errcode"
v2 "github.com/docker/distribution/registry/api/v2"
"github.com/docker/distribution/testutil"
"github.com/docker/distribution/uuid"
"github.com/distribution/distribution/v3"
"github.com/distribution/distribution/v3/context"
"github.com/distribution/distribution/v3/manifest"
"github.com/distribution/distribution/v3/manifest/schema1"
"github.com/distribution/distribution/v3/reference"
"github.com/distribution/distribution/v3/registry/api/errcode"
v2 "github.com/distribution/distribution/v3/registry/api/v2"
"github.com/distribution/distribution/v3/testutil"
"github.com/distribution/distribution/v3/uuid"
"github.com/docker/libtrust"
"github.com/opencontainers/go-digest"
)

26
registry/handlers/api_test.go
View file

@ -20,19 +20,19 @@ import (
"strings"
"testing"
"github.com/docker/distribution"
"github.com/docker/distribution/configuration"
"github.com/docker/distribution/manifest"
"github.com/docker/distribution/manifest/manifestlist"
"github.com/docker/distribution/manifest/schema1"
"github.com/docker/distribution/manifest/schema2"
"github.com/docker/distribution/reference"
"github.com/docker/distribution/registry/api/errcode"
v2 "github.com/docker/distribution/registry/api/v2"
storagedriver "github.com/docker/distribution/registry/storage/driver"
"github.com/docker/distribution/registry/storage/driver/factory"
_ "github.com/docker/distribution/registry/storage/driver/testdriver"
"github.com/docker/distribution/testutil"
"github.com/distribution/distribution/v3"
"github.com/distribution/distribution/v3/configuration"
"github.com/distribution/distribution/v3/manifest"
"github.com/distribution/distribution/v3/manifest/manifestlist"
"github.com/distribution/distribution/v3/manifest/schema1"
"github.com/distribution/distribution/v3/manifest/schema2"
"github.com/distribution/distribution/v3/reference"
"github.com/distribution/distribution/v3/registry/api/errcode"
v2 "github.com/distribution/distribution/v3/registry/api/v2"
storagedriver "github.com/distribution/distribution/v3/registry/storage/driver"
"github.com/distribution/distribution/v3/registry/storage/driver/factory"
_ "github.com/distribution/distribution/v3/registry/storage/driver/testdriver"
"github.com/distribution/distribution/v3/testutil"
"github.com/docker/libtrust"
"github.com/gorilla/handlers"
"github.com/opencontainers/go-digest"

42
registry/handlers/app.go
View file

@ -15,27 +15,27 @@ import (
"strings"
"time"
"github.com/docker/distribution"
"github.com/docker/distribution/configuration"
dcontext "github.com/docker/distribution/context"
"github.com/docker/distribution/health"
"github.com/docker/distribution/health/checks"
prometheus "github.com/docker/distribution/metrics"
"github.com/docker/distribution/notifications"
"github.com/docker/distribution/reference"
"github.com/docker/distribution/registry/api/errcode"
v2 "github.com/docker/distribution/registry/api/v2"
"github.com/docker/distribution/registry/auth"
registrymiddleware "github.com/docker/distribution/registry/middleware/registry"
repositorymiddleware "github.com/docker/distribution/registry/middleware/repository"
"github.com/docker/distribution/registry/proxy"
"github.com/docker/distribution/registry/storage"
memorycache "github.com/docker/distribution/registry/storage/cache/memory"
rediscache "github.com/docker/distribution/registry/storage/cache/redis"
storagedriver "github.com/docker/distribution/registry/storage/driver"
"github.com/docker/distribution/registry/storage/driver/factory"
storagemiddleware "github.com/docker/distribution/registry/storage/driver/middleware"
"github.com/docker/distribution/version"
"github.com/distribution/distribution/v3"
"github.com/distribution/distribution/v3/configuration"
dcontext "github.com/distribution/distribution/v3/context"
"github.com/distribution/distribution/v3/health"
"github.com/distribution/distribution/v3/health/checks"
prometheus "github.com/distribution/distribution/v3/metrics"
"github.com/distribution/distribution/v3/notifications"
"github.com/distribution/distribution/v3/reference"
"github.com/distribution/distribution/v3/registry/api/errcode"
v2 "github.com/distribution/distribution/v3/registry/api/v2"
"github.com/distribution/distribution/v3/registry/auth"
registrymiddleware "github.com/distribution/distribution/v3/registry/middleware/registry"
repositorymiddleware "github.com/distribution/distribution/v3/registry/middleware/repository"
"github.com/distribution/distribution/v3/registry/proxy"
"github.com/distribution/distribution/v3/registry/storage"
memorycache "github.com/distribution/distribution/v3/registry/storage/cache/memory"
rediscache "github.com/distribution/distribution/v3/registry/storage/cache/redis"
storagedriver "github.com/distribution/distribution/v3/registry/storage/driver"
"github.com/distribution/distribution/v3/registry/storage/driver/factory"
storagemiddleware "github.com/distribution/distribution/v3/registry/storage/driver/middleware"
"github.com/distribution/distribution/v3/version"
events "github.com/docker/go-events"
"github.com/docker/go-metrics"
"github.com/docker/libtrust"

18
registry/handlers/app_test.go
View file

@ -8,15 +8,15 @@ import (
"reflect"
"testing"
"github.com/docker/distribution/configuration"
"github.com/docker/distribution/context"
"github.com/docker/distribution/registry/api/errcode"
v2 "github.com/docker/distribution/registry/api/v2"
"github.com/docker/distribution/registry/auth"
_ "github.com/docker/distribution/registry/auth/silly"
"github.com/docker/distribution/registry/storage"
memorycache "github.com/docker/distribution/registry/storage/cache/memory"
"github.com/docker/distribution/registry/storage/driver/testdriver"
"github.com/distribution/distribution/v3/configuration"
"github.com/distribution/distribution/v3/context"
"github.com/distribution/distribution/v3/registry/api/errcode"
v2 "github.com/distribution/distribution/v3/registry/api/v2"
"github.com/distribution/distribution/v3/registry/auth"
_ "github.com/distribution/distribution/v3/registry/auth/silly"
"github.com/distribution/distribution/v3/registry/storage"
memorycache "github.com/distribution/distribution/v3/registry/storage/cache/memory"
"github.com/distribution/distribution/v3/registry/storage/driver/testdriver"
)
// TestAppDispatcher builds an application with a test dispatcher and ensures

8
registry/handlers/blob.go
View file

@ -3,10 +3,10 @@ package handlers
import (
"net/http"
"github.com/docker/distribution"
"github.com/docker/distribution/context"
"github.com/docker/distribution/registry/api/errcode"
v2 "github.com/docker/distribution/registry/api/v2"
"github.com/distribution/distribution/v3"
"github.com/distribution/distribution/v3/context"
"github.com/distribution/distribution/v3/registry/api/errcode"
v2 "github.com/distribution/distribution/v3/registry/api/v2"
"github.com/gorilla/handlers"
"github.com/opencontainers/go-digest"
)

12
registry/handlers/blobupload.go
View file

@ -5,12 +5,12 @@ import (
"net/http"
"net/url"
"github.com/docker/distribution"
dcontext "github.com/docker/distribution/context"
"github.com/docker/distribution/reference"
"github.com/docker/distribution/registry/api/errcode"
v2 "github.com/docker/distribution/registry/api/v2"
"github.com/docker/distribution/registry/storage"
"github.com/distribution/distribution/v3"
dcontext "github.com/distribution/distribution/v3/context"
"github.com/distribution/distribution/v3/reference"
"github.com/distribution/distribution/v3/registry/api/errcode"
v2 "github.com/distribution/distribution/v3/registry/api/v2"
"github.com/distribution/distribution/v3/registry/storage"
"github.com/gorilla/handlers"
"github.com/opencontainers/go-digest"
)

4
registry/handlers/catalog.go
View file

@ -8,8 +8,8 @@ import (
"net/url"
"strconv"
"github.com/docker/distribution/registry/api/errcode"
"github.com/docker/distribution/registry/storage/driver"
"github.com/distribution/distribution/v3/registry/api/errcode"
"github.com/distribution/distribution/v3/registry/storage/driver"
"github.com/gorilla/handlers"
)

10
registry/handlers/context.go
View file

@ -5,11 +5,11 @@ import (
"fmt"
"net/http"
"github.com/docker/distribution"
dcontext "github.com/docker/distribution/context"
"github.com/docker/distribution/registry/api/errcode"
v2 "github.com/docker/distribution/registry/api/v2"
"github.com/docker/distribution/registry/auth"
"github.com/distribution/distribution/v3"
dcontext "github.com/distribution/distribution/v3/context"
"github.com/distribution/distribution/v3/registry/api/errcode"
v2 "github.com/distribution/distribution/v3/registry/api/v2"
"github.com/distribution/distribution/v3/registry/auth"
"github.com/opencontainers/go-digest"
)

6
registry/handlers/health_test.go
View file

@ -9,9 +9,9 @@ import (
"testing"
"time"
"github.com/docker/distribution/configuration"
"github.com/docker/distribution/context"
"github.com/docker/distribution/health"
"github.com/distribution/distribution/v3/configuration"
"github.com/distribution/distribution/v3/context"
"github.com/distribution/distribution/v3/health"
)
func TestFileHealthCheck(t *testing.T) {

2
registry/handlers/helpers.go
View file

@ -6,7 +6,7 @@ import (
"io"
"net/http"
dcontext "github.com/docker/distribution/context"
dcontext "github.com/distribution/distribution/v3/context"
)
// closeResources closes all the provided resources after running the target

20
registry/handlers/manifests.go
View file

@ -7,16 +7,16 @@ import (
"net/http"
"strings"
"github.com/docker/distribution"
dcontext "github.com/docker/distribution/context"
"github.com/docker/distribution/manifest/manifestlist"
"github.com/docker/distribution/manifest/ocischema"
"github.com/docker/distribution/manifest/schema1"
"github.com/docker/distribution/manifest/schema2"
"github.com/docker/distribution/reference"
"github.com/docker/distribution/registry/api/errcode"
v2 "github.com/docker/distribution/registry/api/v2"
"github.com/docker/distribution/registry/auth"
"github.com/distribution/distribution/v3"
dcontext "github.com/distribution/distribution/v3/context"
"github.com/distribution/distribution/v3/manifest/manifestlist"
"github.com/distribution/distribution/v3/manifest/ocischema"
"github.com/distribution/distribution/v3/manifest/schema1"
"github.com/distribution/distribution/v3/manifest/schema2"
"github.com/distribution/distribution/v3/reference"
"github.com/distribution/distribution/v3/registry/api/errcode"
v2 "github.com/distribution/distribution/v3/registry/api/v2"
"github.com/distribution/distribution/v3/registry/auth"
"github.com/gorilla/handlers"
"github.com/opencontainers/go-digest"
v1 "github.com/opencontainers/image-spec/specs-go/v1"

6
registry/handlers/tags.go
View file

@ -4,9 +4,9 @@ import (
"encoding/json"
"net/http"
"github.com/docker/distribution"
"github.com/docker/distribution/registry/api/errcode"
v2 "github.com/docker/distribution/registry/api/v2"
"github.com/distribution/distribution/v3"
"github.com/distribution/distribution/v3/registry/api/errcode"
v2 "github.com/distribution/distribution/v3/registry/api/v2"
"github.com/gorilla/handlers"
)

4
registry/middleware/registry/middleware.go
View file

@ -4,8 +4,8 @@ import (
"context"
"fmt"
"github.com/docker/distribution"
"github.com/docker/distribution/registry/storage"
"github.com/distribution/distribution/v3"
"github.com/distribution/distribution/v3/registry/storage"
)
// InitFunc is the type of a RegistryMiddleware factory function and is

2
registry/middleware/repository/middleware.go
View file

@ -4,7 +4,7 @@ import (
"context"
"fmt"
"github.com/docker/distribution"
"github.com/distribution/distribution/v3"
)
// InitFunc is the type of a RepositoryMiddleware factory function and is

6
registry/proxy/proxyauth.go
View file

@ -5,9 +5,9 @@ import (
"net/url"
"strings"
"github.com/docker/distribution/context"
"github.com/docker/distribution/registry/client/auth"
"github.com/docker/distribution/registry/client/auth/challenge"
"github.com/distribution/distribution/v3/context"
"github.com/distribution/distribution/v3/registry/client/auth"
"github.com/distribution/distribution/v3/registry/client/auth/challenge"
)
const challengeHeader = "Docker-Distribution-Api-Version"

8
registry/proxy/proxyblobstore.go
View file

@ -7,10 +7,10 @@ import (
"strconv"
"sync"
"github.com/docker/distribution"
dcontext "github.com/docker/distribution/context"
"github.com/docker/distribution/reference"
"github.com/docker/distribution/registry/proxy/scheduler"
"github.com/distribution/distribution/v3"
dcontext "github.com/distribution/distribution/v3/context"
"github.com/distribution/distribution/v3/reference"
"github.com/distribution/distribution/v3/registry/proxy/scheduler"
"github.com/opencontainers/go-digest"
)

14
registry/proxy/proxyblobstore_test.go
View file

@ -10,13 +10,13 @@ import (
"testing"
"time"
"github.com/docker/distribution"
"github.com/docker/distribution/reference"
"github.com/docker/distribution/registry/proxy/scheduler"
"github.com/docker/distribution/registry/storage"
"github.com/docker/distribution/registry/storage/cache/memory"
"github.com/docker/distribution/registry/storage/driver/filesystem"
"github.com/docker/distribution/registry/storage/driver/inmemory"
"github.com/distribution/distribution/v3"
"github.com/distribution/distribution/v3/reference"
"github.com/distribution/distribution/v3/registry/proxy/scheduler"
"github.com/distribution/distribution/v3/registry/storage"
"github.com/distribution/distribution/v3/registry/storage/cache/memory"
"github.com/distribution/distribution/v3/registry/storage/driver/filesystem"
"github.com/distribution/distribution/v3/registry/storage/driver/inmemory"
"github.com/opencontainers/go-digest"
)

8
registry/proxy/proxymanifeststore.go
View file

@ -4,10 +4,10 @@ import (
"context"
"time"
"github.com/docker/distribution"
dcontext "github.com/docker/distribution/context"
"github.com/docker/distribution/reference"
"github.com/docker/distribution/registry/proxy/scheduler"
"github.com/distribution/distribution/v3"
dcontext "github.com/distribution/distribution/v3/context"
"github.com/distribution/distribution/v3/reference"
"github.com/distribution/distribution/v3/registry/proxy/scheduler"
"github.com/opencontainers/go-digest"
)

22
registry/proxy/proxymanifeststore_test.go
View file

@ -6,17 +6,17 @@ import (
"sync"
"testing"
"github.com/docker/distribution"
"github.com/docker/distribution/manifest"
"github.com/docker/distribution/manifest/schema1"
"github.com/docker/distribution/reference"
"github.com/docker/distribution/registry/client/auth"
"github.com/docker/distribution/registry/client/auth/challenge"
"github.com/docker/distribution/registry/proxy/scheduler"
"github.com/docker/distribution/registry/storage"
"github.com/docker/distribution/registry/storage/cache/memory"
"github.com/docker/distribution/registry/storage/driver/inmemory"
"github.com/docker/distribution/testutil"
"github.com/distribution/distribution/v3"
"github.com/distribution/distribution/v3/manifest"
"github.com/distribution/distribution/v3/manifest/schema1"
"github.com/distribution/distribution/v3/reference"
"github.com/distribution/distribution/v3/registry/client/auth"
"github.com/distribution/distribution/v3/registry/client/auth/challenge"
"github.com/distribution/distribution/v3/registry/proxy/scheduler"
"github.com/distribution/distribution/v3/registry/storage"
"github.com/distribution/distribution/v3/registry/storage/cache/memory"
"github.com/distribution/distribution/v3/registry/storage/driver/inmemory"
"github.com/distribution/distribution/v3/testutil"
"github.com/docker/libtrust"
"github.com/opencontainers/go-digest"
)

22
registry/proxy/proxyregistry.go
View file

@ -7,17 +7,17 @@ import (
"net/url"
"sync"
"github.com/docker/distribution"
"github.com/docker/distribution/configuration"
dcontext "github.com/docker/distribution/context"
"github.com/docker/distribution/reference"
"github.com/docker/distribution/registry/client"
"github.com/docker/distribution/registry/client/auth"
"github.com/docker/distribution/registry/client/auth/challenge"
"github.com/docker/distribution/registry/client/transport"
"github.com/docker/distribution/registry/proxy/scheduler"
"github.com/docker/distribution/registry/storage"
"github.com/docker/distribution/registry/storage/driver"
"github.com/distribution/distribution/v3"
"github.com/distribution/distribution/v3/configuration"
dcontext "github.com/distribution/distribution/v3/context"
"github.com/distribution/distribution/v3/reference"
"github.com/distribution/distribution/v3/registry/client"
"github.com/distribution/distribution/v3/registry/client/auth"
"github.com/distribution/distribution/v3/registry/client/auth/challenge"
"github.com/distribution/distribution/v3/registry/client/transport"
"github.com/distribution/distribution/v3/registry/proxy/scheduler"
"github.com/distribution/distribution/v3/registry/storage"
"github.com/distribution/distribution/v3/registry/storage/driver"
)
// proxyingRegistry fetches content from a remote registry and caches it locally

2
registry/proxy/proxytagservice.go
View file

@ -3,7 +3,7 @@ package proxy
import (
"context"
"github.com/docker/distribution"
"github.com/distribution/distribution/v3"
)
// proxyTagService supports local and remote lookup of tags.

2
registry/proxy/proxytagservice_test.go
View file

@ -7,7 +7,7 @@ import (
"sync"
"testing"
"github.com/docker/distribution"
"github.com/distribution/distribution/v3"
)
type mockTagStore struct {

6
registry/proxy/scheduler/scheduler.go
View file

@ -7,9 +7,9 @@ import (
"sync"
"time"
dcontext "github.com/docker/distribution/context"
"github.com/docker/distribution/reference"
"github.com/docker/distribution/registry/storage/driver"
dcontext "github.com/distribution/distribution/v3/context"
"github.com/distribution/distribution/v3/reference"
"github.com/distribution/distribution/v3/registry/storage/driver"
)
// onTTLExpiryFunc is called when a repository's TTL expires

6
registry/proxy/scheduler/scheduler_test.go
View file

@ -6,9 +6,9 @@ import (
"testing"
"time"
"github.com/docker/distribution/context"
"github.com/docker/distribution/reference"
"github.com/docker/distribution/registry/storage/driver/inmemory"
"github.com/distribution/distribution/v3/context"
"github.com/distribution/distribution/v3/reference"
"github.com/distribution/distribution/v3/registry/storage/driver/inmemory"
)
func testRefs(t *testing.T) (reference.Reference, reference.Reference, reference.Reference) {

14
registry/registry.go
View file

@ -24,13 +24,13 @@ import (
"golang.org/x/crypto/acme"
"golang.org/x/crypto/acme/autocert"
"github.com/docker/distribution/configuration"
dcontext "github.com/docker/distribution/context"
"github.com/docker/distribution/health"
"github.com/docker/distribution/registry/handlers"
"github.com/docker/distribution/registry/listener"
"github.com/docker/distribution/uuid"
"github.com/docker/distribution/version"
"github.com/distribution/distribution/v3/configuration"
dcontext "github.com/distribution/distribution/v3/context"
"github.com/distribution/distribution/v3/health"
"github.com/distribution/distribution/v3/registry/handlers"
"github.com/distribution/distribution/v3/registry/listener"
"github.com/distribution/distribution/v3/uuid"
"github.com/distribution/distribution/v3/version"
)
// this channel gets notified when process receives signal. It is global to ease unit testing

4
registry/registry_test.go
View file

@ -12,8 +12,8 @@ import (
"testing"
"time"
"github.com/docker/distribution/configuration"
_ "github.com/docker/distribution/registry/storage/driver/inmemory"
"github.com/distribution/distribution/v3/configuration"
_ "github.com/distribution/distribution/v3/registry/storage/driver/inmemory"
)
// Tests to ensure nextProtos returns the correct protocols when:

8
registry/root.go
View file

@ -4,10 +4,10 @@ import (
"fmt"
"os"
dcontext "github.com/docker/distribution/context"
"github.com/docker/distribution/registry/storage"
"github.com/docker/distribution/registry/storage/driver/factory"
"github.com/docker/distribution/version"
dcontext "github.com/distribution/distribution/v3/context"
"github.com/distribution/distribution/v3/registry/storage"
"github.com/distribution/distribution/v3/registry/storage/driver/factory"
"github.com/distribution/distribution/v3/version"
"github.com/docker/libtrust"
"github.com/spf13/cobra"
)

10
registry/storage/blob_test.go
View file

@ -11,11 +11,11 @@ import (
"reflect"
"testing"
"github.com/docker/distribution"
"github.com/docker/distribution/reference"
"github.com/docker/distribution/registry/storage/cache/memory"
"github.com/docker/distribution/registry/storage/driver/testdriver"
"github.com/docker/distribution/testutil"
"github.com/distribution/distribution/v3"
"github.com/distribution/distribution/v3/reference"
"github.com/distribution/distribution/v3/registry/storage/cache/memory"
"github.com/distribution/distribution/v3/registry/storage/driver/testdriver"
"github.com/distribution/distribution/v3/testutil"
"github.com/opencontainers/go-digest"
)

4
registry/storage/blobserver.go
View file

@ -6,8 +6,8 @@ import (
"net/http"
"time"
"github.com/docker/distribution"
"github.com/docker/distribution/registry/storage/driver"
"github.com/distribution/distribution/v3"
"github.com/distribution/distribution/v3/registry/storage/driver"
"github.com/opencontainers/go-digest"
)

6
registry/storage/blobstore.go
View file

@ -4,9 +4,9 @@ import (
"context"
"path"
"github.com/docker/distribution"
dcontext "github.com/docker/distribution/context"
"github.com/docker/distribution/registry/storage/driver"
"github.com/distribution/distribution/v3"
dcontext "github.com/distribution/distribution/v3/context"
"github.com/distribution/distribution/v3/registry/storage/driver"
"github.com/opencontainers/go-digest"
)

6
registry/storage/blobwriter.go
View file

@ -8,9 +8,9 @@ import (
"path"
"time"
"github.com/docker/distribution"
dcontext "github.com/docker/distribution/context"
storagedriver "github.com/docker/distribution/registry/storage/driver"
"github.com/distribution/distribution/v3"
dcontext "github.com/distribution/distribution/v3/context"
storagedriver "github.com/distribution/distribution/v3/registry/storage/driver"
"github.com/opencontainers/go-digest"
"github.com/sirupsen/logrus"
)

2
registry/storage/blobwriter_nonresumable.go
View file

@ -3,7 +3,7 @@
package storage
import (
"github.com/docker/distribution/context"
"github.com/distribution/distribution/v3/context"
)
// resumeHashAt is a noop when resumable digest support is disabled.

2
registry/storage/blobwriter_resumable.go
View file

@ -10,7 +10,7 @@ import (
"path"
"strconv"
storagedriver "github.com/docker/distribution/registry/storage/driver"
storagedriver "github.com/distribution/distribution/v3/registry/storage/driver"
"github.com/sirupsen/logrus"
)

2
registry/storage/cache/cache.go vendored
View file

@ -5,7 +5,7 @@ package cache
import (
"fmt"
"github.com/docker/distribution"
"github.com/distribution/distribution/v3"
)
// BlobDescriptorCacheProvider provides repository scoped

2
registry/storage/cache/cache_test.go vendored
View file

@ -5,7 +5,7 @@ import (
"errors"
"testing"
"github.com/docker/distribution"
"github.com/distribution/distribution/v3"
digest "github.com/opencontainers/go-digest"
)

4
registry/storage/cache/cachecheck/suite.go vendored
View file

@ -5,8 +5,8 @@ import (
"reflect"
"testing"
"github.com/docker/distribution"
"github.com/docker/distribution/registry/storage/cache"
"github.com/distribution/distribution/v3"
"github.com/distribution/distribution/v3/registry/storage/cache"
"github.com/opencontainers/go-digest"
)

6
registry/storage/cache/cachedblobdescriptorstore.go vendored
View file

@ -3,9 +3,9 @@ package cache
import (
"context"
"github.com/docker/distribution"
dcontext "github.com/docker/distribution/context"
prometheus "github.com/docker/distribution/metrics"
"github.com/distribution/distribution/v3"
dcontext "github.com/distribution/distribution/v3/context"
prometheus "github.com/distribution/distribution/v3/metrics"
"github.com/opencontainers/go-digest"
)

6
registry/storage/cache/memory/memory.go vendored
View file

@ -4,9 +4,9 @@ import (
"context"
"sync"
"github.com/docker/distribution"
"github.com/docker/distribution/reference"
"github.com/docker/distribution/registry/storage/cache"
"github.com/distribution/distribution/v3"
"github.com/distribution/distribution/v3/reference"
"github.com/distribution/distribution/v3/registry/storage/cache"
"github.com/opencontainers/go-digest"
)

2
registry/storage/cache/memory/memory_test.go vendored
View file

@ -3,7 +3,7 @@ package memory
import (
"testing"
"github.com/docker/distribution/registry/storage/cache/cachecheck"
"github.com/distribution/distribution/v3/registry/storage/cache/cachecheck"
)
// TestInMemoryBlobInfoCache checks the in memory implementation is working

6
registry/storage/cache/metrics/prom.go vendored
View file

@ -4,9 +4,9 @@ import (
"context"
"time"
"github.com/docker/distribution"
prometheus "github.com/docker/distribution/metrics"
"github.com/docker/distribution/registry/storage/cache"
"github.com/distribution/distribution/v3"
prometheus "github.com/distribution/distribution/v3/metrics"
"github.com/distribution/distribution/v3/registry/storage/cache"
"github.com/docker/go-metrics"
"github.com/opencontainers/go-digest"
)

8
registry/storage/cache/redis/redis.go vendored
View file

@ -4,10 +4,10 @@ import (
"context"
"fmt"
"github.com/docker/distribution"
"github.com/docker/distribution/reference"
"github.com/docker/distribution/registry/storage/cache"
"github.com/docker/distribution/registry/storage/cache/metrics"
"github.com/distribution/distribution/v3"
"github.com/distribution/distribution/v3/reference"
"github.com/distribution/distribution/v3/registry/storage/cache"
"github.com/distribution/distribution/v3/registry/storage/cache/metrics"
"github.com/gomodule/redigo/redis"
"github.com/opencontainers/go-digest"
)

2
registry/storage/cache/redis/redis_test.go vendored
View file

@ -6,7 +6,7 @@ import (
"testing"
"time"
"github.com/docker/distribution/registry/storage/cache/cachecheck"
"github.com/distribution/distribution/v3/registry/storage/cache/cachecheck"
"github.com/gomodule/redigo/redis"
)

4
registry/storage/catalog.go
View file

@ -7,8 +7,8 @@ import (
"path"
"strings"
"github.com/docker/distribution/reference"
"github.com/docker/distribution/registry/storage/driver"
"github.com/distribution/distribution/v3/reference"
"github.com/distribution/distribution/v3/registry/storage/driver"
)
// Returns a list, or partial list, of repositories in the registry.

12
registry/storage/catalog_test.go
View file

@ -7,12 +7,12 @@ import (
"math/rand"
"testing"
"github.com/docker/distribution"
"github.com/docker/distribution/reference"
"github.com/docker/distribution/registry/storage/cache/memory"
"github.com/docker/distribution/registry/storage/driver"
"github.com/docker/distribution/registry/storage/driver/inmemory"
"github.com/docker/distribution/testutil"
"github.com/distribution/distribution/v3"
"github.com/distribution/distribution/v3/reference"
"github.com/distribution/distribution/v3/registry/storage/cache/memory"
"github.com/distribution/distribution/v3/registry/storage/driver"
"github.com/distribution/distribution/v3/registry/storage/driver/inmemory"
"github.com/distribution/distribution/v3/testutil"
"github.com/opencontainers/go-digest"
)

8
registry/storage/driver/azure/azure.go
View file

@ -13,9 +13,9 @@ import (
"strings"
"time"
storagedriver "github.com/docker/distribution/registry/storage/driver"
"github.com/docker/distribution/registry/storage/driver/base"
"github.com/docker/distribution/registry/storage/driver/factory"
storagedriver "github.com/distribution/distribution/v3/registry/storage/driver"
"github.com/distribution/distribution/v3/registry/storage/driver/base"
"github.com/distribution/distribution/v3/registry/storage/driver/factory"
azure "github.com/Azure/azure-sdk-for-go/storage"
)
@ -127,7 +127,7 @@ func (d *driver) PutContent(ctx context.Context, path string, contents []byte) e
}
// Historically, blobs uploaded via PutContent used to be of type AppendBlob
// (https://github.com/docker/distribution/pull/1438). We can't replace
// (https://github.com/distribution/distribution/pull/1438). We can't replace
// these blobs atomically via a single "Put Blob" operation without
// deleting them first. Once we detect they are BlockBlob type, we can
// overwrite them with an atomically "Put Blob" operation.

4
registry/storage/driver/azure/azure_test.go
View file

@ -6,8 +6,8 @@ import (
"strings"
"testing"
storagedriver "github.com/docker/distribution/registry/storage/driver"
"github.com/docker/distribution/registry/storage/driver/testsuites"
storagedriver "github.com/distribution/distribution/v3/registry/storage/driver"
"github.com/distribution/distribution/v3/registry/storage/driver/testsuites"
. "gopkg.in/check.v1"
)

6
registry/storage/driver/base/base.go
View file

@ -42,9 +42,9 @@ import (
"io"
"time"
dcontext "github.com/docker/distribution/context"
prometheus "github.com/docker/distribution/metrics"
storagedriver "github.com/docker/distribution/registry/storage/driver"
dcontext "github.com/distribution/distribution/v3/context"
prometheus "github.com/distribution/distribution/v3/metrics"
storagedriver "github.com/distribution/distribution/v3/registry/storage/driver"
"github.com/docker/go-metrics"
)

2
registry/storage/driver/base/regulator.go
View file

@ -8,7 +8,7 @@ import (
"strconv"
"sync"
storagedriver "github.com/docker/distribution/registry/storage/driver"
storagedriver "github.com/distribution/distribution/v3/registry/storage/driver"
)
type regulator struct {

4
registry/storage/driver/factory/factory.go
View file

@ -3,7 +3,7 @@ package factory
import (
"fmt"
storagedriver "github.com/docker/distribution/registry/storage/driver"
storagedriver "github.com/distribution/distribution/v3/registry/storage/driver"
)
// driverFactories stores an internal mapping between storage driver names and their respective
@ -16,7 +16,7 @@ var driverFactories = make(map[string]StorageDriverFactory)
// func (below) in their init() funcs, and as such they should be imported anonymously before use.
// See below for an example of how to register and get a StorageDriver for S3
//
// import _ "github.com/docker/distribution/registry/storage/driver/s3-aws"
// import _ "github.com/distribution/distribution/v3/registry/storage/driver/s3-aws"
// s3Driver, err = factory.Create("s3", storageParams)
// // assuming no error, s3Driver is the StorageDriver that communicates with S3 according to storageParams
type StorageDriverFactory interface {

6
registry/storage/driver/filesystem/driver.go
View file

@ -11,9 +11,9 @@ import (
"path"
"time"
storagedriver "github.com/docker/distribution/registry/storage/driver"
"github.com/docker/distribution/registry/storage/driver/base"
"github.com/docker/distribution/registry/storage/driver/factory"
storagedriver "github.com/distribution/distribution/v3/registry/storage/driver"
"github.com/distribution/distribution/v3/registry/storage/driver/base"
"github.com/distribution/distribution/v3/registry/storage/driver/factory"
)
const (

4
registry/storage/driver/filesystem/driver_test.go
View file

@ -6,8 +6,8 @@ import (
"reflect"
"testing"
storagedriver "github.com/docker/distribution/registry/storage/driver"
"github.com/docker/distribution/registry/storage/driver/testsuites"
storagedriver "github.com/distribution/distribution/v3/registry/storage/driver"
"github.com/distribution/distribution/v3/registry/storage/driver/testsuites"
. "gopkg.in/check.v1"
)

6
registry/storage/driver/gcs/gcs.go
View file

@ -31,9 +31,9 @@ import (
"strings"
"time"
storagedriver "github.com/docker/distribution/registry/storage/driver"
"github.com/docker/distribution/registry/storage/driver/base"
"github.com/docker/distribution/registry/storage/driver/factory"
storagedriver "github.com/distribution/distribution/v3/registry/storage/driver"
"github.com/distribution/distribution/v3/registry/storage/driver/base"
"github.com/distribution/distribution/v3/registry/storage/driver/factory"
"github.com/sirupsen/logrus"
"golang.org/x/oauth2"
"golang.org/x/oauth2/google"

6
registry/storage/driver/gcs/gcs_test.go
View file

@ -8,9 +8,9 @@ import (
"os"
"testing"
dcontext "github.com/docker/distribution/context"
storagedriver "github.com/docker/distribution/registry/storage/driver"
"github.com/docker/distribution/registry/storage/driver/testsuites"
dcontext "github.com/distribution/distribution/v3/context"
storagedriver "github.com/distribution/distribution/v3/registry/storage/driver"
"github.com/distribution/distribution/v3/registry/storage/driver/testsuites"
"golang.org/x/oauth2"
"golang.org/x/oauth2/google"
"google.golang.org/api/googleapi"

6
registry/storage/driver/inmemory/driver.go
View file

@ -8,9 +8,9 @@ import (
"sync"
"time"
storagedriver "github.com/docker/distribution/registry/storage/driver"
"github.com/docker/distribution/registry/storage/driver/base"
"github.com/docker/distribution/registry/storage/driver/factory"
storagedriver "github.com/distribution/distribution/v3/registry/storage/driver"
"github.com/distribution/distribution/v3/registry/storage/driver/base"
"github.com/distribution/distribution/v3/registry/storage/driver/factory"
)
const driverName = "inmemory"

4
registry/storage/driver/inmemory/driver_test.go
View file

@ -3,8 +3,8 @@ package inmemory
import (
"testing"
storagedriver "github.com/docker/distribution/registry/storage/driver"
"github.com/docker/distribution/registry/storage/driver/testsuites"
storagedriver "github.com/distribution/distribution/v3/registry/storage/driver"
"github.com/distribution/distribution/v3/registry/storage/driver/testsuites"
"gopkg.in/check.v1"
)

6
registry/storage/driver/middleware/alicdn/middleware.go
View file

@ -7,9 +7,9 @@ import (
"strings"
"time"
dcontext "github.com/docker/distribution/context"
storagedriver "github.com/docker/distribution/registry/storage/driver"
storagemiddleware "github.com/docker/distribution/registry/storage/driver/middleware"
dcontext "github.com/distribution/distribution/v3/context"
storagedriver "github.com/distribution/distribution/v3/registry/storage/driver"
storagemiddleware "github.com/distribution/distribution/v3/registry/storage/driver/middleware"
"github.com/denverdino/aliyungo/cdn/auth"
)

6
registry/storage/driver/middleware/cloudfront/middleware.go
View file

@ -14,9 +14,9 @@ import (
"time"
"github.com/aws/aws-sdk-go/service/cloudfront/sign"
dcontext "github.com/docker/distribution/context"
storagedriver "github.com/docker/distribution/registry/storage/driver"
storagemiddleware "github.com/docker/distribution/registry/storage/driver/middleware"
dcontext "github.com/distribution/distribution/v3/context"
storagedriver "github.com/distribution/distribution/v3/registry/storage/driver"
storagemiddleware "github.com/distribution/distribution/v3/registry/storage/driver/middleware"
)
// cloudFrontStorageMiddleware provides a simple implementation of layerHandler that

2
registry/storage/driver/middleware/cloudfront/s3filter.go
View file

@ -11,7 +11,7 @@ import (
"sync"
"time"
dcontext "github.com/docker/distribution/context"
dcontext "github.com/distribution/distribution/v3/context"
)
const (

2
registry/storage/driver/middleware/cloudfront/s3filter_test.go
View file

@ -11,7 +11,7 @@ import (
"testing"
"time"
dcontext "github.com/docker/distribution/context"
dcontext "github.com/distribution/distribution/v3/context"
"reflect" // used as a replacement for testify
)

4
registry/storage/driver/middleware/redirect/middleware.go
View file

@ -5,8 +5,8 @@ import (
"fmt"
"net/url"
storagedriver "github.com/docker/distribution/registry/storage/driver"
storagemiddleware "github.com/docker/distribution/registry/storage/driver/middleware"
storagedriver "github.com/distribution/distribution/v3/registry/storage/driver"
storagemiddleware "github.com/distribution/distribution/v3/registry/storage/driver/middleware"
)
type redirectStorageMiddleware struct {

2
registry/storage/driver/middleware/storagemiddleware.go
View file

@ -3,7 +3,7 @@ package storagemiddleware
import (
"fmt"
storagedriver "github.com/docker/distribution/registry/storage/driver"
storagedriver "github.com/distribution/distribution/v3/registry/storage/driver"
)
// InitFunc is the type of a StorageMiddleware factory function and is

6
registry/storage/driver/oss/oss.go
View file

@ -24,9 +24,9 @@ import (
"time"
"github.com/denverdino/aliyungo/oss"
storagedriver "github.com/docker/distribution/registry/storage/driver"
"github.com/docker/distribution/registry/storage/driver/base"
"github.com/docker/distribution/registry/storage/driver/factory"
storagedriver "github.com/distribution/distribution/v3/registry/storage/driver"
"github.com/distribution/distribution/v3/registry/storage/driver/base"
"github.com/distribution/distribution/v3/registry/storage/driver/factory"
"github.com/sirupsen/logrus"
)

6
registry/storage/driver/oss/oss_test.go
View file

@ -9,9 +9,9 @@ import (
"testing"
alioss "github.com/denverdino/aliyungo/oss"
"github.com/docker/distribution/context"
storagedriver "github.com/docker/distribution/registry/storage/driver"
"github.com/docker/distribution/registry/storage/driver/testsuites"
"github.com/distribution/distribution/v3/context"
storagedriver "github.com/distribution/distribution/v3/registry/storage/driver"
"github.com/distribution/distribution/v3/registry/storage/driver/testsuites"
"gopkg.in/check.v1"
)

10
registry/storage/driver/s3-aws/s3.go
View file

@ -34,11 +34,11 @@ import (
"github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/service/s3"
dcontext "github.com/docker/distribution/context"
"github.com/docker/distribution/registry/client/transport"
storagedriver "github.com/docker/distribution/registry/storage/driver"
"github.com/docker/distribution/registry/storage/driver/base"
"github.com/docker/distribution/registry/storage/driver/factory"
dcontext "github.com/distribution/distribution/v3/context"
"github.com/distribution/distribution/v3/registry/client/transport"
storagedriver "github.com/distribution/distribution/v3/registry/storage/driver"
"github.com/distribution/distribution/v3/registry/storage/driver/base"
"github.com/distribution/distribution/v3/registry/storage/driver/factory"
)
const driverName = "s3aws"

6
registry/storage/driver/s3-aws/s3_test.go
View file

@ -14,9 +14,9 @@ import (
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/service/s3"
"github.com/docker/distribution/context"
storagedriver "github.com/docker/distribution/registry/storage/driver"
"github.com/docker/distribution/registry/storage/driver/testsuites"
"github.com/distribution/distribution/v3/context"
storagedriver "github.com/distribution/distribution/v3/registry/storage/driver"
"github.com/distribution/distribution/v3/registry/storage/driver/testsuites"
)
// Hook up gocheck into the "go test" runner.

2
registry/storage/driver/storagedriver.go
View file

@ -35,7 +35,7 @@ const CurrentVersion Version = "0.1"
// StorageDriver defines methods that a Storage Driver must implement for a
// filesystem-like key/value object storage. Storage Drivers are automatically
// registered via an internal registration mechanism, and generally created
// via the StorageDriverFactory interface (https://godoc.org/github.com/docker/distribution/registry/storage/driver/factory).
// via the StorageDriverFactory interface (https://godoc.org/github.com/distribution/distribution/registry/storage/driver/factory).
// Please see the aforementioned factory package for example code showing how to get an instance
// of a StorageDriver
type StorageDriver interface {

8
registry/storage/driver/swift/swift.go
View file

@ -35,10 +35,10 @@ import (
"github.com/mitchellh/mapstructure"
"github.com/ncw/swift"
storagedriver "github.com/docker/distribution/registry/storage/driver"
"github.com/docker/distribution/registry/storage/driver/base"
"github.com/docker/distribution/registry/storage/driver/factory"
"github.com/docker/distribution/version"
storagedriver "github.com/distribution/distribution/v3/registry/storage/driver"
"github.com/distribution/distribution/v3/registry/storage/driver/base"
"github.com/distribution/distribution/v3/registry/storage/driver/factory"
"github.com/distribution/distribution/v3/version"
)
const driverName = "swift"

6
registry/storage/driver/swift/swift_test.go
View file

@ -10,9 +10,9 @@ import (
"github.com/ncw/swift/swifttest"
"github.com/docker/distribution/context"
storagedriver "github.com/docker/distribution/registry/storage/driver"
"github.com/docker/distribution/registry/storage/driver/testsuites"
"github.com/distribution/distribution/v3/context"
storagedriver "github.com/distribution/distribution/v3/registry/storage/driver"
"github.com/distribution/distribution/v3/registry/storage/driver/testsuites"
"gopkg.in/check.v1"
)

6
registry/storage/driver/testdriver/testdriver.go
View file

@ -3,9 +3,9 @@ package testdriver
import (
"context"
storagedriver "github.com/docker/distribution/registry/storage/driver"
"github.com/docker/distribution/registry/storage/driver/factory"
"github.com/docker/distribution/registry/storage/driver/inmemory"
storagedriver "github.com/distribution/distribution/v3/registry/storage/driver"
"github.com/distribution/distribution/v3/registry/storage/driver/factory"
"github.com/distribution/distribution/v3/registry/storage/driver/inmemory"
)
const driverName = "testdriver"

2
registry/storage/driver/testsuites/testsuites.go
View file

@ -16,7 +16,7 @@ import (
"testing"
"time"
storagedriver "github.com/docker/distribution/registry/storage/driver"
storagedriver "github.com/distribution/distribution/v3/registry/storage/driver"
"gopkg.in/check.v1"
)

2
registry/storage/filereader.go
View file

@ -8,7 +8,7 @@ import (
"io"
"io/ioutil"
storagedriver "github.com/docker/distribution/registry/storage/driver"
storagedriver "github.com/distribution/distribution/v3/registry/storage/driver"
)
// TODO(stevvooe): Set an optimal buffer size here. We'll have to

4
registry/storage/filereader_test.go
View file

@ -6,8 +6,8 @@ import (
mrand "math/rand"
"testing"
"github.com/docker/distribution/context"
"github.com/docker/distribution/registry/storage/driver/inmemory"
"github.com/distribution/distribution/v3/context"
"github.com/distribution/distribution/v3/registry/storage/driver/inmemory"
"github.com/opencontainers/go-digest"
)

6
registry/storage/garbagecollect.go
View file

@ -4,9 +4,9 @@ import (
"context"
"fmt"
"github.com/docker/distribution"
"github.com/docker/distribution/reference"
"github.com/docker/distribution/registry/storage/driver"
"github.com/distribution/distribution/v3"
"github.com/distribution/distribution/v3/reference"
"github.com/distribution/distribution/v3/registry/storage/driver"
"github.com/opencontainers/go-digest"
)

12
registry/storage/garbagecollect_test.go
View file

@ -5,12 +5,12 @@ import (
"path"
"testing"
"github.com/docker/distribution"
"github.com/docker/distribution/context"
"github.com/docker/distribution/reference"
"github.com/docker/distribution/registry/storage/driver"
"github.com/docker/distribution/registry/storage/driver/inmemory"
"github.com/docker/distribution/testutil"
"github.com/distribution/distribution/v3"
"github.com/distribution/distribution/v3/context"
"github.com/distribution/distribution/v3/reference"
"github.com/distribution/distribution/v3/registry/storage/driver"
"github.com/distribution/distribution/v3/registry/storage/driver/inmemory"
"github.com/distribution/distribution/v3/testutil"
"github.com/docker/libtrust"
"github.com/opencontainers/go-digest"
)

2
registry/storage/io.go
View file

@ -6,7 +6,7 @@ import (
"io"
"io/ioutil"
"github.com/docker/distribution/registry/storage/driver"
"github.com/distribution/distribution/v3/registry/storage/driver"
)
const (

10
registry/storage/linkedblobstore.go
View file

@ -7,11 +7,11 @@ import (
"path"
"time"
"github.com/docker/distribution"
dcontext "github.com/docker/distribution/context"
"github.com/docker/distribution/reference"
"github.com/docker/distribution/registry/storage/driver"
"github.com/docker/distribution/uuid"
"github.com/distribution/distribution/v3"
dcontext "github.com/distribution/distribution/v3/context"
"github.com/distribution/distribution/v3/reference"
"github.com/distribution/distribution/v3/registry/storage/driver"
"github.com/distribution/distribution/v3/uuid"
"github.com/opencontainers/go-digest"
)

6
registry/storage/linkedblobstore_test.go
View file

@ -9,9 +9,9 @@ import (
"strconv"
"testing"
"github.com/docker/distribution"
"github.com/docker/distribution/reference"
"github.com/docker/distribution/testutil"
"github.com/distribution/distribution/v3"
"github.com/distribution/distribution/v3/reference"
"github.com/distribution/distribution/v3/testutil"
"github.com/opencontainers/go-digest"
)

6
registry/storage/manifestlisthandler.go
View file

@ -4,9 +4,9 @@ import (
"context"
"fmt"
"github.com/docker/distribution"
dcontext "github.com/docker/distribution/context"
"github.com/docker/distribution/manifest/manifestlist"
"github.com/distribution/distribution/v3"
dcontext "github.com/distribution/distribution/v3/context"
"github.com/distribution/distribution/v3/manifest/manifestlist"
"github.com/opencontainers/go-digest"
)

14
registry/storage/manifeststore.go
View file

@ -5,13 +5,13 @@ import (
"encoding/json"
"fmt"
"github.com/docker/distribution"
dcontext "github.com/docker/distribution/context"
"github.com/docker/distribution/manifest"
"github.com/docker/distribution/manifest/manifestlist"
"github.com/docker/distribution/manifest/ocischema"
"github.com/docker/distribution/manifest/schema1"
"github.com/docker/distribution/manifest/schema2"
"github.com/distribution/distribution/v3"
dcontext "github.com/distribution/distribution/v3/context"
"github.com/distribution/distribution/v3/manifest"
"github.com/distribution/distribution/v3/manifest/manifestlist"
"github.com/distribution/distribution/v3/manifest/ocischema"
"github.com/distribution/distribution/v3/manifest/schema1"
"github.com/distribution/distribution/v3/manifest/schema2"
"github.com/opencontainers/go-digest"
v1 "github.com/opencontainers/image-spec/specs-go/v1"
)

20
registry/storage/manifeststore_test.go
View file

@ -7,16 +7,16 @@ import (
"reflect"
"testing"
"github.com/docker/distribution"
"github.com/docker/distribution/manifest"
"github.com/docker/distribution/manifest/manifestlist"
"github.com/docker/distribution/manifest/ocischema"
"github.com/docker/distribution/manifest/schema1"
"github.com/docker/distribution/reference"
"github.com/docker/distribution/registry/storage/cache/memory"
"github.com/docker/distribution/registry/storage/driver"
"github.com/docker/distribution/registry/storage/driver/inmemory"
"github.com/docker/distribution/testutil"
"github.com/distribution/distribution/v3"
"github.com/distribution/distribution/v3/manifest"
"github.com/distribution/distribution/v3/manifest/manifestlist"
"github.com/distribution/distribution/v3/manifest/ocischema"
"github.com/distribution/distribution/v3/manifest/schema1"
"github.com/distribution/distribution/v3/reference"
"github.com/distribution/distribution/v3/registry/storage/cache/memory"
"github.com/distribution/distribution/v3/registry/storage/driver"
"github.com/distribution/distribution/v3/registry/storage/driver/inmemory"
"github.com/distribution/distribution/v3/testutil"
"github.com/docker/libtrust"
"github.com/opencontainers/go-digest"
v1 "github.com/opencontainers/image-spec/specs-go/v1"

6
registry/storage/ocimanifesthandler.go
View file

@ -5,9 +5,9 @@ import (
"fmt"
"net/url"
"github.com/docker/distribution"
dcontext "github.com/docker/distribution/context"
"github.com/docker/distribution/manifest/ocischema"
"github.com/distribution/distribution/v3"
dcontext "github.com/distribution/distribution/v3/context"
"github.com/distribution/distribution/v3/manifest/ocischema"
"github.com/opencontainers/go-digest"
v1 "github.com/opencontainers/image-spec/specs-go/v1"
)

8
registry/storage/ocimanifesthandler_test.go
View file

@ -5,10 +5,10 @@ import (
"regexp"
"testing"
"github.com/docker/distribution"
"github.com/docker/distribution/manifest"
"github.com/docker/distribution/manifest/ocischema"
"github.com/docker/distribution/registry/storage/driver/inmemory"
"github.com/distribution/distribution/v3"
"github.com/distribution/distribution/v3/manifest"
"github.com/distribution/distribution/v3/manifest/ocischema"
"github.com/distribution/distribution/v3/registry/storage/driver/inmemory"
v1 "github.com/opencontainers/image-spec/specs-go/v1"
)

Some files were not shown because too many files have changed in this diff Show more