From 1d33874951b749df7e070b1c702ea418bbc57ed1 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Mon, 24 Aug 2020 13:18:39 +0200 Subject: [PATCH] go.mod: change imports to github.com/distribution/distribution/v3 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/workflows/ci.yml | 6 +-- BUILDING.md | 34 +++++++-------- Dockerfile | 4 +- GOVERNANCE.md | 2 +- Makefile | 2 +- blobs.go | 2 +- cmd/digest/main.go | 2 +- cmd/registry-api-descriptor-template/main.go | 4 +- cmd/registry/main.go | 30 ++++++------- context/context.go | 4 +- context/http.go | 2 +- context/trace.go | 4 +- contrib/docker-integration/Dockerfile | 2 +- contrib/docker-integration/README.md | 2 +- contrib/token-server/errors.go | 2 +- contrib/token-server/main.go | 8 ++-- contrib/token-server/token.go | 6 +-- contrib/token-server/token_test.go | 2 +- docs/configuration.md | 4 +- docs/spec/auth/jwt.md | 4 +- docs/spec/auth/scope.md | 2 +- docs/spec/implementations.md | 2 +- docs/spec/manifest-v2-1.md | 2 +- go.mod | 2 +- health/api/api.go | 2 +- health/api/api_test.go | 2 +- health/checks/checks.go | 2 +- health/doc.go | 6 +-- health/health.go | 4 +- manifest/manifestlist/manifestlist.go | 4 +- manifest/manifestlist/manifestlist_test.go | 4 +- manifest/ocischema/builder.go | 4 +- manifest/ocischema/builder_test.go | 2 +- manifest/ocischema/manifest.go | 4 +- manifest/ocischema/manifest_test.go | 4 +- manifest/schema1/config_builder.go | 6 +-- manifest/schema1/config_builder_test.go | 6 +-- manifest/schema1/manifest.go | 4 +- manifest/schema1/reference_builder.go | 6 +-- manifest/schema1/reference_builder_test.go | 6 +-- manifest/schema2/builder.go | 2 +- manifest/schema2/builder_test.go | 2 +- manifest/schema2/manifest.go | 4 +- manifest/schema2/manifest_test.go | 4 +- notifications/bridge.go | 8 ++-- notifications/bridge_test.go | 10 ++--- notifications/endpoint.go | 2 +- notifications/event.go | 2 +- notifications/event_test.go | 2 +- notifications/http_test.go | 2 +- notifications/listener.go | 6 +-- notifications/listener_test.go | 18 ++++---- notifications/metrics.go | 2 +- reference/normalize.go | 2 +- reference/normalize_test.go | 2 +- reference/reference_test.go | 2 +- registry.go | 2 +- registry/api/v2/descriptors.go | 4 +- registry/api/v2/errors.go | 2 +- registry/api/v2/urls.go | 2 +- registry/api/v2/urls_test.go | 2 +- registry/auth/htpasswd/access.go | 4 +- registry/auth/htpasswd/access_test.go | 4 +- registry/auth/htpasswd/htpasswd.go | 2 +- registry/auth/silly/access.go | 4 +- registry/auth/silly/access_test.go | 4 +- registry/auth/token/accesscontroller.go | 4 +- registry/auth/token/token.go | 2 +- registry/auth/token/token_test.go | 4 +- registry/client/auth/session.go | 6 +-- registry/client/auth/session_test.go | 6 +-- registry/client/blob_writer.go | 2 +- registry/client/blob_writer_test.go | 8 ++-- registry/client/errors.go | 4 +- registry/client/repository.go | 12 +++--- registry/client/repository_test.go | 18 ++++---- registry/handlers/api_test.go | 26 ++++++------ registry/handlers/app.go | 42 +++++++++---------- registry/handlers/app_test.go | 18 ++++---- registry/handlers/blob.go | 8 ++-- registry/handlers/blobupload.go | 12 +++--- registry/handlers/catalog.go | 4 +- registry/handlers/context.go | 10 ++--- registry/handlers/health_test.go | 6 +-- registry/handlers/helpers.go | 2 +- registry/handlers/manifests.go | 20 ++++----- registry/handlers/tags.go | 6 +-- registry/middleware/registry/middleware.go | 4 +- registry/middleware/repository/middleware.go | 2 +- registry/proxy/proxyauth.go | 6 +-- registry/proxy/proxyblobstore.go | 8 ++-- registry/proxy/proxyblobstore_test.go | 14 +++---- registry/proxy/proxymanifeststore.go | 8 ++-- registry/proxy/proxymanifeststore_test.go | 22 +++++----- registry/proxy/proxyregistry.go | 22 +++++----- registry/proxy/proxytagservice.go | 2 +- registry/proxy/proxytagservice_test.go | 2 +- registry/proxy/scheduler/scheduler.go | 6 +-- registry/proxy/scheduler/scheduler_test.go | 6 +-- registry/registry.go | 14 +++---- registry/registry_test.go | 4 +- registry/root.go | 8 ++-- registry/storage/blob_test.go | 10 ++--- registry/storage/blobserver.go | 4 +- registry/storage/blobstore.go | 6 +-- registry/storage/blobwriter.go | 6 +-- registry/storage/blobwriter_nonresumable.go | 2 +- registry/storage/blobwriter_resumable.go | 2 +- registry/storage/cache/cache.go | 2 +- registry/storage/cache/cache_test.go | 2 +- registry/storage/cache/cachecheck/suite.go | 4 +- .../cache/cachedblobdescriptorstore.go | 6 +-- registry/storage/cache/memory/memory.go | 6 +-- registry/storage/cache/memory/memory_test.go | 2 +- registry/storage/cache/metrics/prom.go | 6 +-- registry/storage/cache/redis/redis.go | 8 ++-- registry/storage/cache/redis/redis_test.go | 2 +- registry/storage/catalog.go | 4 +- registry/storage/catalog_test.go | 12 +++--- registry/storage/driver/azure/azure.go | 8 ++-- registry/storage/driver/azure/azure_test.go | 4 +- registry/storage/driver/base/base.go | 6 +-- registry/storage/driver/base/regulator.go | 2 +- registry/storage/driver/factory/factory.go | 4 +- registry/storage/driver/filesystem/driver.go | 6 +-- .../storage/driver/filesystem/driver_test.go | 4 +- registry/storage/driver/gcs/gcs.go | 6 +-- registry/storage/driver/gcs/gcs_test.go | 6 +-- registry/storage/driver/inmemory/driver.go | 6 +-- .../storage/driver/inmemory/driver_test.go | 4 +- .../driver/middleware/alicdn/middleware.go | 6 +-- .../middleware/cloudfront/middleware.go | 6 +-- .../driver/middleware/cloudfront/s3filter.go | 2 +- .../middleware/cloudfront/s3filter_test.go | 2 +- .../driver/middleware/redirect/middleware.go | 4 +- .../driver/middleware/storagemiddleware.go | 2 +- registry/storage/driver/oss/oss.go | 6 +-- registry/storage/driver/oss/oss_test.go | 6 +-- registry/storage/driver/s3-aws/s3.go | 10 ++--- registry/storage/driver/s3-aws/s3_test.go | 6 +-- registry/storage/driver/storagedriver.go | 2 +- registry/storage/driver/swift/swift.go | 8 ++-- registry/storage/driver/swift/swift_test.go | 6 +-- .../storage/driver/testdriver/testdriver.go | 6 +-- .../storage/driver/testsuites/testsuites.go | 2 +- registry/storage/filereader.go | 2 +- registry/storage/filereader_test.go | 4 +- registry/storage/garbagecollect.go | 6 +-- registry/storage/garbagecollect_test.go | 12 +++--- registry/storage/io.go | 2 +- registry/storage/linkedblobstore.go | 10 ++--- registry/storage/linkedblobstore_test.go | 6 +-- registry/storage/manifestlisthandler.go | 6 +-- registry/storage/manifeststore.go | 14 +++---- registry/storage/manifeststore_test.go | 20 ++++----- registry/storage/ocimanifesthandler.go | 6 +-- registry/storage/ocimanifesthandler_test.go | 8 ++-- registry/storage/purgeuploads.go | 4 +- registry/storage/purgeuploads_test.go | 6 +-- registry/storage/registry.go | 8 ++-- registry/storage/schema2manifesthandler.go | 8 ++-- .../storage/schema2manifesthandler_test.go | 10 ++--- registry/storage/signedmanifesthandler.go | 8 ++-- registry/storage/tagstore.go | 4 +- registry/storage/tagstore_test.go | 10 ++--- registry/storage/v1unsupportedhandler.go | 2 +- registry/storage/vacuum.go | 4 +- releases/README.md | 6 +-- releases/v2.7.0.toml | 2 +- testutil/manifests.go | 12 +++--- testutil/tarfile.go | 4 +- version/print.go | 4 +- version/version.go | 4 +- 173 files changed, 527 insertions(+), 527 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9b9a3f699..9dd01f91b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: steps: - uses: actions/checkout@v2 with: - path: src/github.com/docker/distribution + path: src/github.com/distribution/distribution fetch-depth: 50 - name: Set up Go @@ -39,7 +39,7 @@ jobs: cd /tmp && go get -u github.com/vbatts/git-validation - name: Build - working-directory: ./src/github.com/docker/distribution + working-directory: ./src/github.com/distribution/distribution run: | DCO_VERBOSITY=-q script/validate/dco GO111MODULE=on script/setup/install-dev-tools @@ -52,4 +52,4 @@ jobs: - uses: codecov/codecov-action@v1 with: - directory: ./src/github.com/docker/distribution + directory: ./src/github.com/distribution/distribution diff --git a/BUILDING.md b/BUILDING.md index 2981d016b..7fd9b24f7 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -29,7 +29,7 @@ environment. If a Go development environment is setup, one can use `go get` to install the `registry` command from the current latest: - go get github.com/docker/distribution/cmd/registry + go get github.com/distribution/distribution/cmd/registry The above will install the source repository into the `GOPATH`. @@ -43,17 +43,17 @@ The `registry` binary can then be run with the following: $ $GOPATH/bin/registry --version - $GOPATH/bin/registry github.com/docker/distribution v2.0.0-alpha.1+unknown + $GOPATH/bin/registry github.com/distribution/distribution v2.0.0-alpha.1+unknown > __NOTE:__ While you do not need to use `go get` to checkout the distribution > project, for these build instructions to work, the project must be checked > out in the correct location in the `GOPATH`. This should almost always be -> `$GOPATH/src/github.com/docker/distribution`. +> `$GOPATH/src/github.com/distribution/distribution`. The registry can be run with the default config using the following incantation: - $ $GOPATH/bin/registry serve $GOPATH/src/github.com/docker/distribution/cmd/registry/config-example.yml + $ $GOPATH/bin/registry serve $GOPATH/src/github.com/distribution/distribution/cmd/registry/config-example.yml INFO[0000] endpoint local-5003 disabled, skipping app.id=34bbec38-a91a-494a-9a3f-b72f9010081f version=v2.0.0-alpha.1+unknown INFO[0000] endpoint local-8083 disabled, skipping app.id=34bbec38-a91a-494a-9a3f-b72f9010081f version=v2.0.0-alpha.1+unknown INFO[0000] listening on :5000 app.id=34bbec38-a91a-494a-9a3f-b72f9010081f version=v2.0.0-alpha.1+unknown @@ -64,7 +64,7 @@ If it is working, one should see the above log messages. ### Repeatable Builds For the full development experience, one should `cd` into -`$GOPATH/src/github.com/docker/distribution`. From there, the regular `go` +`$GOPATH/src/github.com/distribution/distribution`. From there, the regular `go` commands, such as `go test`, should work per package (please see [Developing](#developing) if they don't work). @@ -87,20 +87,20 @@ build: github.com/docker/libtrust ... github.com/yvasiyarov/gorelic - github.com/docker/distribution/registry/handlers - github.com/docker/distribution/cmd/registry + github.com/distribution/distribution/registry/handlers + github.com/distribution/distribution/cmd/registry + test ... - ok github.com/docker/distribution/digest 7.875s - ok github.com/docker/distribution/manifest 0.028s - ok github.com/docker/distribution/notifications 17.322s - ? github.com/docker/distribution/registry [no test files] - ok github.com/docker/distribution/registry/api/v2 0.101s - ? github.com/docker/distribution/registry/auth [no test files] - ok github.com/docker/distribution/registry/auth/silly 0.011s + ok github.com/distribution/distribution/digest 7.875s + ok github.com/distribution/distribution/manifest 0.028s + ok github.com/distribution/distribution/notifications 17.322s + ? github.com/distribution/distribution/registry [no test files] + ok github.com/distribution/distribution/registry/api/v2 0.101s + ? github.com/distribution/distribution/registry/auth [no test files] + ok github.com/distribution/distribution/registry/auth/silly 0.011s ... - + /Users/sday/go/src/github.com/docker/distribution/bin/registry - + /Users/sday/go/src/github.com/docker/distribution/bin/registry-api-descriptor-template + + /Users/sday/go/src/github.com/distribution/distribution/bin/registry + + /Users/sday/go/src/github.com/distribution/distribution/bin/registry-api-descriptor-template + binaries The above provides a repeatable build using the contents of the vendor @@ -109,7 +109,7 @@ testing and generating tagged binaries. We can verify this worked by running the registry binary generated in the "./bin" directory: $ ./bin/registry --version - ./bin/registry github.com/docker/distribution v2.0.0-alpha.2-80-g16d8b2c.m + ./bin/registry github.com/distribution/distribution v2.0.0-alpha.2-80-g16d8b2c.m ### Optional build tags diff --git a/Dockerfile b/Dockerfile index 269b19746..170fea8fb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ ARG GO_VERSION=1.13.8 FROM golang:${GO_VERSION}-alpine3.11 AS build -ENV DISTRIBUTION_DIR /go/src/github.com/docker/distribution +ENV DISTRIBUTION_DIR /go/src/github.com/distribution/distribution ENV BUILDTAGS include_oss include_gcs ARG GOOS=linux @@ -24,7 +24,7 @@ RUN set -ex \ && apk add --no-cache ca-certificates COPY cmd/registry/config-dev.yml /etc/docker/registry/config.yml -COPY --from=build /go/src/github.com/docker/distribution/bin/registry /bin/registry +COPY --from=build /go/src/github.com/distribution/distribution/bin/registry /bin/registry VOLUME ["/var/lib/registry"] EXPOSE 5000 ENTRYPOINT ["registry"] diff --git a/GOVERNANCE.md b/GOVERNANCE.md index 7c05543fb..2fe6627b4 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -1,4 +1,4 @@ -# docker/distribution Project Governance +# distribution/distribution Project Governance Docker distribution abides by the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md). diff --git a/Makefile b/Makefile index 84aef5f42..5e01549f9 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ VERSION ?= $(shell git describe --match 'v[0-9]*' --dirty='.m' --always) REVISION ?= $(shell git rev-parse HEAD)$(shell if ! git diff --no-ext-diff --quiet --exit-code; then echo .m; fi) -PKG=github.com/docker/distribution +PKG=github.com/distribution/distribution/v3 # Project packages. PACKAGES=$(shell go list -tags "${BUILDTAGS}" ./... | grep -v /vendor/) diff --git a/blobs.go b/blobs.go index 2a659eaa3..33273213b 100644 --- a/blobs.go +++ b/blobs.go @@ -8,7 +8,7 @@ import ( "net/http" "time" - "github.com/docker/distribution/reference" + "github.com/distribution/distribution/v3/reference" "github.com/opencontainers/go-digest" v1 "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/cmd/digest/main.go b/cmd/digest/main.go index 308be461e..744cc88a7 100644 --- a/cmd/digest/main.go +++ b/cmd/digest/main.go @@ -7,7 +7,7 @@ import ( "log" "os" - "github.com/docker/distribution/version" + "github.com/distribution/distribution/v3/version" "github.com/opencontainers/go-digest" _ "crypto/sha256" diff --git a/cmd/registry-api-descriptor-template/main.go b/cmd/registry-api-descriptor-template/main.go index e69e6b2cf..e59fd7684 100644 --- a/cmd/registry-api-descriptor-template/main.go +++ b/cmd/registry-api-descriptor-template/main.go @@ -20,8 +20,8 @@ import ( "regexp" "text/template" - "github.com/docker/distribution/registry/api/errcode" - v2 "github.com/docker/distribution/registry/api/v2" + "github.com/distribution/distribution/v3/registry/api/errcode" + v2 "github.com/distribution/distribution/v3/registry/api/v2" ) var spaceRegex = regexp.MustCompile(`\n\s*`) diff --git a/cmd/registry/main.go b/cmd/registry/main.go index 06a3cf194..09a09260d 100644 --- a/cmd/registry/main.go +++ b/cmd/registry/main.go @@ -3,21 +3,21 @@ package main import ( _ "net/http/pprof" - "github.com/docker/distribution/registry" - _ "github.com/docker/distribution/registry/auth/htpasswd" - _ "github.com/docker/distribution/registry/auth/silly" - _ "github.com/docker/distribution/registry/auth/token" - _ "github.com/docker/distribution/registry/proxy" - _ "github.com/docker/distribution/registry/storage/driver/azure" - _ "github.com/docker/distribution/registry/storage/driver/filesystem" - _ "github.com/docker/distribution/registry/storage/driver/gcs" - _ "github.com/docker/distribution/registry/storage/driver/inmemory" - _ "github.com/docker/distribution/registry/storage/driver/middleware/alicdn" - _ "github.com/docker/distribution/registry/storage/driver/middleware/cloudfront" - _ "github.com/docker/distribution/registry/storage/driver/middleware/redirect" - _ "github.com/docker/distribution/registry/storage/driver/oss" - _ "github.com/docker/distribution/registry/storage/driver/s3-aws" - _ "github.com/docker/distribution/registry/storage/driver/swift" + "github.com/distribution/distribution/v3/registry" + _ "github.com/distribution/distribution/v3/registry/auth/htpasswd" + _ "github.com/distribution/distribution/v3/registry/auth/silly" + _ "github.com/distribution/distribution/v3/registry/auth/token" + _ "github.com/distribution/distribution/v3/registry/proxy" + _ "github.com/distribution/distribution/v3/registry/storage/driver/azure" + _ "github.com/distribution/distribution/v3/registry/storage/driver/filesystem" + _ "github.com/distribution/distribution/v3/registry/storage/driver/gcs" + _ "github.com/distribution/distribution/v3/registry/storage/driver/inmemory" + _ "github.com/distribution/distribution/v3/registry/storage/driver/middleware/alicdn" + _ "github.com/distribution/distribution/v3/registry/storage/driver/middleware/cloudfront" + _ "github.com/distribution/distribution/v3/registry/storage/driver/middleware/redirect" + _ "github.com/distribution/distribution/v3/registry/storage/driver/oss" + _ "github.com/distribution/distribution/v3/registry/storage/driver/s3-aws" + _ "github.com/distribution/distribution/v3/registry/storage/driver/swift" ) func main() { diff --git a/context/context.go b/context/context.go index ab6865467..0a199615f 100644 --- a/context/context.go +++ b/context/context.go @@ -4,7 +4,7 @@ import ( "context" "sync" - "github.com/docker/distribution/uuid" + "github.com/distribution/distribution/v3/uuid" ) // instanceContext is a context that provides only an instance id. It is @@ -21,7 +21,7 @@ func (ic *instanceContext) Value(key interface{}) interface{} { // We want to lazy initialize the UUID such that we don't // call a random generator from the package initialization // code. For various reasons random could not be available - // https://github.com/docker/distribution/issues/782 + // https://github.com/distribution/distribution/issues/782 ic.id = uuid.Generate().String() }) return ic.id diff --git a/context/http.go b/context/http.go index bc22f0bba..548e4e175 100644 --- a/context/http.go +++ b/context/http.go @@ -9,7 +9,7 @@ import ( "sync" "time" - "github.com/docker/distribution/uuid" + "github.com/distribution/distribution/v3/uuid" "github.com/gorilla/mux" log "github.com/sirupsen/logrus" ) diff --git a/context/trace.go b/context/trace.go index 5b88ddaf4..9476afa9a 100644 --- a/context/trace.go +++ b/context/trace.go @@ -5,7 +5,7 @@ import ( "runtime" "time" - "github.com/docker/distribution/uuid" + "github.com/distribution/distribution/v3/uuid" ) // WithTrace allocates a traced timing span in a new context. This allows a @@ -33,7 +33,7 @@ import ( // If the function ran for roughly 1s, such a usage would emit a log message // as follows: // -// INFO[0001] this will be the log message trace.duration=1.004575763s trace.func=github.com/docker/distribution/context.traceOperation trace.id= ... +// INFO[0001] this will be the log message trace.duration=1.004575763s trace.func=github.com/distribution/distribution/context.traceOperation trace.id= ... // // Notice that the function name is automatically resolved, along with the // package and a trace id is emitted that can be linked with parent ids. diff --git a/contrib/docker-integration/Dockerfile b/contrib/docker-integration/Dockerfile index 7a047a689..17e348306 100644 --- a/contrib/docker-integration/Dockerfile +++ b/contrib/docker-integration/Dockerfile @@ -6,4 +6,4 @@ RUN apk add --no-cache git ENV TMPDIR /var/lib/docker/tmp -WORKDIR /go/src/github.com/docker/distribution/contrib/docker-integration +WORKDIR /go/src/github.com/distribution/distribution/contrib/docker-integration diff --git a/contrib/docker-integration/README.md b/contrib/docker-integration/README.md index 2b44e88c7..20b7c0f2e 100644 --- a/contrib/docker-integration/README.md +++ b/contrib/docker-integration/README.md @@ -38,7 +38,7 @@ the [release page](https://github.com/docker/golem/releases/tag/v0.1). Additionally golem can be run as a docker image requiring no additional installation. -`docker run --privileged -v "$GOPATH/src/github.com/docker/distribution/contrib/docker-integration:/test" -w /test distribution/golem golem -rundaemon .` +`docker run --privileged -v "$GOPATH/src/github.com/distribution/distribution/contrib/docker-integration:/test" -w /test distribution/golem golem -rundaemon .` #### Golem custom images diff --git a/contrib/token-server/errors.go b/contrib/token-server/errors.go index bcac8ee35..297832391 100644 --- a/contrib/token-server/errors.go +++ b/contrib/token-server/errors.go @@ -3,7 +3,7 @@ package main import ( "net/http" - "github.com/docker/distribution/registry/api/errcode" + "github.com/distribution/distribution/v3/registry/api/errcode" ) var ( diff --git a/contrib/token-server/main.go b/contrib/token-server/main.go index 8f9029eae..e722cd8e5 100644 --- a/contrib/token-server/main.go +++ b/contrib/token-server/main.go @@ -10,10 +10,10 @@ import ( "strings" "time" - dcontext "github.com/docker/distribution/context" - "github.com/docker/distribution/registry/api/errcode" - "github.com/docker/distribution/registry/auth" - _ "github.com/docker/distribution/registry/auth/htpasswd" + dcontext "github.com/distribution/distribution/v3/context" + "github.com/distribution/distribution/v3/registry/api/errcode" + "github.com/distribution/distribution/v3/registry/auth" + _ "github.com/distribution/distribution/v3/registry/auth/htpasswd" "github.com/docker/libtrust" "github.com/gorilla/mux" "github.com/sirupsen/logrus" diff --git a/contrib/token-server/token.go b/contrib/token-server/token.go index 8df5b6a85..a66c767de 100644 --- a/contrib/token-server/token.go +++ b/contrib/token-server/token.go @@ -12,9 +12,9 @@ import ( "strings" "time" - dcontext "github.com/docker/distribution/context" - "github.com/docker/distribution/registry/auth" - "github.com/docker/distribution/registry/auth/token" + dcontext "github.com/distribution/distribution/v3/context" + "github.com/distribution/distribution/v3/registry/auth" + "github.com/distribution/distribution/v3/registry/auth/token" "github.com/docker/libtrust" ) diff --git a/contrib/token-server/token_test.go b/contrib/token-server/token_test.go index cd9ea30d5..e6d291ea3 100644 --- a/contrib/token-server/token_test.go +++ b/contrib/token-server/token_test.go @@ -10,7 +10,7 @@ import ( "strings" - "github.com/docker/distribution/registry/auth" + "github.com/distribution/distribution/v3/registry/auth" "github.com/docker/libtrust" ) diff --git a/docs/configuration.md b/docs/configuration.md index f2c7d9546..c386f203e 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -55,7 +55,7 @@ $ docker run -d -p 5000:5000 --restart=always --name registry \ ``` Use this -[example YAML file](https://github.com/docker/distribution/blob/master/cmd/registry/config-example.yml) +[example YAML file](https://github.com/distribution/distribution/blob/master/cmd/registry/config-example.yml) as a starting point. ## List of configuration options @@ -1206,7 +1206,7 @@ This example configures the registry instance to run on port `5000`, binding to verbose. See -[config-example.yml](https://github.com/docker/distribution/blob/master/cmd/registry/config-example.yml) +[config-example.yml](https://github.com/distribution/distribution/blob/master/cmd/registry/config-example.yml) for another simple configuration. Both examples are generally useful for local development. diff --git a/docs/spec/auth/jwt.md b/docs/spec/auth/jwt.md index ef729efe5..7959707fc 100644 --- a/docs/spec/auth/jwt.md +++ b/docs/spec/auth/jwt.md @@ -6,9 +6,9 @@ keywords: registry, on-prem, images, tags, repository, distribution, JWT authent # Docker Registry v2 Bearer token specification -This specification covers the `docker/distribution` implementation of the +This specification covers the `distribution/distribution` implementation of the v2 Registry's authentication schema. Specifically, it describes the JSON -Web Token schema that `docker/distribution` has adopted to implement the +Web Token schema that `distribution/distribution` has adopted to implement the client-opaque Bearer token issued by an authentication service and understood by the registry. diff --git a/docs/spec/auth/scope.md b/docs/spec/auth/scope.md index 037fd6762..1bf9504ce 100644 --- a/docs/spec/auth/scope.md +++ b/docs/spec/auth/scope.md @@ -100,7 +100,7 @@ alpha-numeric := /[a-z0-9]+/ separator := /[_.]|__|[-]*/ ``` Full reference grammar is defined -[here](https://godoc.org/github.com/docker/distribution/reference). Currently +[here](https://godoc.org/github.com/distribution/distribution/reference). Currently the scope name grammar is a subset of the reference grammar. > **NOTE:** that the `resourcename` may contain one `:` due to a possible port diff --git a/docs/spec/implementations.md b/docs/spec/implementations.md index 347465350..cd0428382 100644 --- a/docs/spec/implementations.md +++ b/docs/spec/implementations.md @@ -6,7 +6,7 @@ published: false This is a list of known implementations of the Distribution API spec. -## [Docker Distribution Registry](https://github.com/docker/distribution) +## [Docker Distribution Registry](https://github.com/distribution/distribution) Docker distribution is the reference implementation of the distribution API specification. It aims to fully implement the entire specification. diff --git a/docs/spec/manifest-v2-1.md b/docs/spec/manifest-v2-1.md index 335509b00..82be05df6 100644 --- a/docs/spec/manifest-v2-1.md +++ b/docs/spec/manifest-v2-1.md @@ -12,7 +12,7 @@ release](https://github.com/docker/docker/commit/9f482a66ab37ec396ac61ed0c00d591 It is a provisional manifest to provide a compatibility with the [V1 Image format](https://github.com/docker/docker/blob/master/image/spec/v1.md), as the requirements are defined for the [V2 Schema 2 -image](https://github.com/docker/distribution/pull/62). +image](https://github.com/distribution/distribution/pull/62). Image manifests describe the various constituents of a docker image. Image diff --git a/go.mod b/go.mod index d22088378..61d7ec164 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/docker/distribution +module github.com/distribution/distribution/v3 go 1.12 diff --git a/health/api/api.go b/health/api/api.go index a323a1273..826b1b017 100644 --- a/health/api/api.go +++ b/health/api/api.go @@ -4,7 +4,7 @@ import ( "errors" "net/http" - "github.com/docker/distribution/health" + "github.com/distribution/distribution/v3/health" ) var ( diff --git a/health/api/api_test.go b/health/api/api_test.go index ec82154f6..bd840878c 100644 --- a/health/api/api_test.go +++ b/health/api/api_test.go @@ -5,7 +5,7 @@ import ( "net/http/httptest" "testing" - "github.com/docker/distribution/health" + "github.com/distribution/distribution/v3/health" ) // TestGETDownHandlerDoesNotChangeStatus ensures that calling the endpoint diff --git a/health/checks/checks.go b/health/checks/checks.go index 7760f6105..500e10296 100644 --- a/health/checks/checks.go +++ b/health/checks/checks.go @@ -10,7 +10,7 @@ import ( "strconv" "time" - "github.com/docker/distribution/health" + "github.com/distribution/distribution/v3/health" ) // FileChecker checks the existence of a file and returns an error diff --git a/health/doc.go b/health/doc.go index 877f4daca..b2a70205a 100644 --- a/health/doc.go +++ b/health/doc.go @@ -17,14 +17,14 @@ // // To install health, just import it in your application: // -// import "github.com/docker/distribution/health" +// import "github.com/distribution/distribution/v3/health" // // You can also (optionally) import "health/api" that will add two convenience // endpoints: "/debug/health/down" and "/debug/health/up". These endpoints add // "manual" checks that allow the service to quickly be brought in/out of // rotation. // -// import _ "github.com/docker/distribution/health/api" +// import _ "github.com/distribution/distribution/v3/health/api" // // # curl localhost:5001/debug/health // {} @@ -105,7 +105,7 @@ // You can also use the predefined Checkers that come included with the health // package. First, import the checks: // -// import "github.com/docker/distribution/health/checks +// import "github.com/distribution/distribution/v3/health/checks // // After that you can make use of any of the provided checks. An example of // using a `FileChecker` to take the application out of rotation if a certain diff --git a/health/health.go b/health/health.go index 93f8d6d1c..35991cb08 100644 --- a/health/health.go +++ b/health/health.go @@ -7,8 +7,8 @@ import ( "sync" "time" - "github.com/docker/distribution/context" - "github.com/docker/distribution/registry/api/errcode" + "github.com/distribution/distribution/v3/context" + "github.com/distribution/distribution/v3/registry/api/errcode" ) // A Registry is a collection of checks. Most applications will use the global diff --git a/manifest/manifestlist/manifestlist.go b/manifest/manifestlist/manifestlist.go index 3a1d73e83..833a6d500 100644 --- a/manifest/manifestlist/manifestlist.go +++ b/manifest/manifestlist/manifestlist.go @@ -5,8 +5,8 @@ import ( "errors" "fmt" - "github.com/docker/distribution" - "github.com/docker/distribution/manifest" + "github.com/distribution/distribution/v3" + "github.com/distribution/distribution/v3/manifest" "github.com/opencontainers/go-digest" v1 "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/manifest/manifestlist/manifestlist_test.go b/manifest/manifestlist/manifestlist_test.go index 6d0d952c2..fc77af185 100644 --- a/manifest/manifestlist/manifestlist_test.go +++ b/manifest/manifestlist/manifestlist_test.go @@ -6,7 +6,7 @@ import ( "reflect" "testing" - "github.com/docker/distribution" + "github.com/distribution/distribution/v3" v1 "github.com/opencontainers/image-spec/specs-go/v1" ) @@ -119,7 +119,7 @@ func TestManifestList(t *testing.T) { // TODO (mikebrow): add annotations on the manifest list (index) and support for // empty platform structs (move to Platform *Platform `json:"platform,omitempty"` // from current Platform PlatformSpec `json:"platform"`) in the manifest descriptor. -// Requires changes to docker/distribution/manifest/manifestlist.ManifestList and .ManifestDescriptor +// Requires changes to distribution/distribution/manifest/manifestlist.ManifestList and .ManifestDescriptor // and associated serialization APIs in manifestlist.go. Or split the OCI index and // docker manifest list implementations, which would require a lot of refactoring. var expectedOCIImageIndexSerialization = []byte(`{ diff --git a/manifest/ocischema/builder.go b/manifest/ocischema/builder.go index b89bf5b71..7d99c184f 100644 --- a/manifest/ocischema/builder.go +++ b/manifest/ocischema/builder.go @@ -4,8 +4,8 @@ import ( "context" "errors" - "github.com/docker/distribution" - "github.com/docker/distribution/manifest" + "github.com/distribution/distribution/v3" + "github.com/distribution/distribution/v3/manifest" "github.com/opencontainers/go-digest" v1 "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/manifest/ocischema/builder_test.go b/manifest/ocischema/builder_test.go index 7332f3a4a..2e511393c 100644 --- a/manifest/ocischema/builder_test.go +++ b/manifest/ocischema/builder_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/docker/distribution" + "github.com/distribution/distribution/v3" "github.com/opencontainers/go-digest" v1 "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/manifest/ocischema/manifest.go b/manifest/ocischema/manifest.go index c5e85f285..968de6e32 100644 --- a/manifest/ocischema/manifest.go +++ b/manifest/ocischema/manifest.go @@ -5,8 +5,8 @@ import ( "errors" "fmt" - "github.com/docker/distribution" - "github.com/docker/distribution/manifest" + "github.com/distribution/distribution/v3" + "github.com/distribution/distribution/v3/manifest" "github.com/opencontainers/go-digest" v1 "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/manifest/ocischema/manifest_test.go b/manifest/ocischema/manifest_test.go index b211fd094..87a6479e7 100644 --- a/manifest/ocischema/manifest_test.go +++ b/manifest/ocischema/manifest_test.go @@ -6,8 +6,8 @@ import ( "reflect" "testing" - "github.com/docker/distribution" - "github.com/docker/distribution/manifest" + "github.com/distribution/distribution/v3" + "github.com/distribution/distribution/v3/manifest" v1 "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/manifest/schema1/config_builder.go b/manifest/schema1/config_builder.go index a96dc3d26..8d7221ede 100644 --- a/manifest/schema1/config_builder.go +++ b/manifest/schema1/config_builder.go @@ -8,9 +8,9 @@ import ( "fmt" "time" - "github.com/docker/distribution" - "github.com/docker/distribution/manifest" - "github.com/docker/distribution/reference" + "github.com/distribution/distribution/v3" + "github.com/distribution/distribution/v3/manifest" + "github.com/distribution/distribution/v3/reference" "github.com/docker/libtrust" "github.com/opencontainers/go-digest" ) diff --git a/manifest/schema1/config_builder_test.go b/manifest/schema1/config_builder_test.go index 3e913a238..788332be4 100644 --- a/manifest/schema1/config_builder_test.go +++ b/manifest/schema1/config_builder_test.go @@ -8,9 +8,9 @@ import ( "reflect" "testing" - "github.com/docker/distribution" - dcontext "github.com/docker/distribution/context" - "github.com/docker/distribution/reference" + "github.com/distribution/distribution/v3" + dcontext "github.com/distribution/distribution/v3/context" + "github.com/distribution/distribution/v3/reference" "github.com/docker/libtrust" "github.com/opencontainers/go-digest" ) diff --git a/manifest/schema1/manifest.go b/manifest/schema1/manifest.go index 9fef4dc7e..ecbef3d3d 100644 --- a/manifest/schema1/manifest.go +++ b/manifest/schema1/manifest.go @@ -4,8 +4,8 @@ import ( "encoding/json" "fmt" - "github.com/docker/distribution" - "github.com/docker/distribution/manifest" + "github.com/distribution/distribution/v3" + "github.com/distribution/distribution/v3/manifest" "github.com/docker/libtrust" "github.com/opencontainers/go-digest" ) diff --git a/manifest/schema1/reference_builder.go b/manifest/schema1/reference_builder.go index 0f1d386aa..26ad57846 100644 --- a/manifest/schema1/reference_builder.go +++ b/manifest/schema1/reference_builder.go @@ -5,9 +5,9 @@ import ( "errors" "fmt" - "github.com/docker/distribution" - "github.com/docker/distribution/manifest" - "github.com/docker/distribution/reference" + "github.com/distribution/distribution/v3" + "github.com/distribution/distribution/v3/manifest" + "github.com/distribution/distribution/v3/reference" "github.com/docker/libtrust" "github.com/opencontainers/go-digest" ) diff --git a/manifest/schema1/reference_builder_test.go b/manifest/schema1/reference_builder_test.go index 9eaa666c9..31fde6468 100644 --- a/manifest/schema1/reference_builder_test.go +++ b/manifest/schema1/reference_builder_test.go @@ -3,9 +3,9 @@ package schema1 import ( "testing" - "github.com/docker/distribution/context" - "github.com/docker/distribution/manifest" - "github.com/docker/distribution/reference" + "github.com/distribution/distribution/v3/context" + "github.com/distribution/distribution/v3/manifest" + "github.com/distribution/distribution/v3/reference" "github.com/docker/libtrust" "github.com/opencontainers/go-digest" ) diff --git a/manifest/schema2/builder.go b/manifest/schema2/builder.go index 3facaae62..52da82e33 100644 --- a/manifest/schema2/builder.go +++ b/manifest/schema2/builder.go @@ -3,7 +3,7 @@ package schema2 import ( "context" - "github.com/docker/distribution" + "github.com/distribution/distribution/v3" "github.com/opencontainers/go-digest" ) diff --git a/manifest/schema2/builder_test.go b/manifest/schema2/builder_test.go index cde73242e..7a0397993 100644 --- a/manifest/schema2/builder_test.go +++ b/manifest/schema2/builder_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/docker/distribution" + "github.com/distribution/distribution/v3" "github.com/opencontainers/go-digest" ) diff --git a/manifest/schema2/manifest.go b/manifest/schema2/manifest.go index 41f480292..e96d86325 100644 --- a/manifest/schema2/manifest.go +++ b/manifest/schema2/manifest.go @@ -5,8 +5,8 @@ import ( "errors" "fmt" - "github.com/docker/distribution" - "github.com/docker/distribution/manifest" + "github.com/distribution/distribution/v3" + "github.com/distribution/distribution/v3/manifest" "github.com/opencontainers/go-digest" ) diff --git a/manifest/schema2/manifest_test.go b/manifest/schema2/manifest_test.go index 45f7f7d04..7c4336b27 100644 --- a/manifest/schema2/manifest_test.go +++ b/manifest/schema2/manifest_test.go @@ -6,8 +6,8 @@ import ( "reflect" "testing" - "github.com/docker/distribution" - "github.com/docker/distribution/manifest" + "github.com/distribution/distribution/v3" + "github.com/distribution/distribution/v3/manifest" ) var expectedManifestSerialization = []byte(`{ diff --git a/notifications/bridge.go b/notifications/bridge.go index bf62806d4..58a1d3fc3 100644 --- a/notifications/bridge.go +++ b/notifications/bridge.go @@ -4,10 +4,10 @@ import ( "net/http" "time" - "github.com/docker/distribution" - "github.com/docker/distribution/context" - "github.com/docker/distribution/reference" - "github.com/docker/distribution/uuid" + "github.com/distribution/distribution/v3" + "github.com/distribution/distribution/v3/context" + "github.com/distribution/distribution/v3/reference" + "github.com/distribution/distribution/v3/uuid" events "github.com/docker/go-events" "github.com/opencontainers/go-digest" ) diff --git a/notifications/bridge_test.go b/notifications/bridge_test.go index a09be6572..29622b1c7 100644 --- a/notifications/bridge_test.go +++ b/notifications/bridge_test.go @@ -3,11 +3,11 @@ package notifications import ( "testing" - "github.com/docker/distribution" - "github.com/docker/distribution/manifest/schema1" - "github.com/docker/distribution/reference" - v2 "github.com/docker/distribution/registry/api/v2" - "github.com/docker/distribution/uuid" + "github.com/distribution/distribution/v3" + "github.com/distribution/distribution/v3/manifest/schema1" + "github.com/distribution/distribution/v3/reference" + v2 "github.com/distribution/distribution/v3/registry/api/v2" + "github.com/distribution/distribution/v3/uuid" events "github.com/docker/go-events" "github.com/docker/libtrust" "github.com/opencontainers/go-digest" diff --git a/notifications/endpoint.go b/notifications/endpoint.go index da6b9622c..f67e8cfe7 100644 --- a/notifications/endpoint.go +++ b/notifications/endpoint.go @@ -4,7 +4,7 @@ import ( "net/http" "time" - "github.com/docker/distribution/configuration" + "github.com/distribution/distribution/v3/configuration" events "github.com/docker/go-events" ) diff --git a/notifications/event.go b/notifications/event.go index 864783e10..2a3c4e21a 100644 --- a/notifications/event.go +++ b/notifications/event.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/docker/distribution" + "github.com/distribution/distribution/v3" events "github.com/docker/go-events" ) diff --git a/notifications/event_test.go b/notifications/event_test.go index 2dddf944b..2fdc6a7d4 100644 --- a/notifications/event_test.go +++ b/notifications/event_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/docker/distribution/manifest/schema1" + "github.com/distribution/distribution/v3/manifest/schema1" ) // TestEventJSONFormat provides silly test to detect if the event format or diff --git a/notifications/http_test.go b/notifications/http_test.go index e878dcb0c..b62ea8ae2 100644 --- a/notifications/http_test.go +++ b/notifications/http_test.go @@ -13,7 +13,7 @@ import ( "strings" "testing" - "github.com/docker/distribution/manifest/schema1" + "github.com/distribution/distribution/v3/manifest/schema1" events "github.com/docker/go-events" ) diff --git a/notifications/listener.go b/notifications/listener.go index 98ad8da9f..9c0d27085 100644 --- a/notifications/listener.go +++ b/notifications/listener.go @@ -4,10 +4,10 @@ import ( "context" "net/http" - "github.com/docker/distribution" + "github.com/distribution/distribution/v3" - dcontext "github.com/docker/distribution/context" - "github.com/docker/distribution/reference" + dcontext "github.com/distribution/distribution/v3/context" + "github.com/distribution/distribution/v3/reference" "github.com/opencontainers/go-digest" ) diff --git a/notifications/listener_test.go b/notifications/listener_test.go index dee4dac5a..744396686 100644 --- a/notifications/listener_test.go +++ b/notifications/listener_test.go @@ -5,15 +5,15 @@ import ( "reflect" "testing" - "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/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/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/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" ) diff --git a/notifications/metrics.go b/notifications/metrics.go index d9432f0af..c520f332b 100644 --- a/notifications/metrics.go +++ b/notifications/metrics.go @@ -6,7 +6,7 @@ import ( "net/http" "sync" - prometheus "github.com/docker/distribution/metrics" + prometheus "github.com/distribution/distribution/v3/metrics" events "github.com/docker/go-events" "github.com/docker/go-metrics" ) diff --git a/reference/normalize.go b/reference/normalize.go index 944e28170..6a02a3175 100644 --- a/reference/normalize.go +++ b/reference/normalize.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/docker/distribution/digestset" + "github.com/distribution/distribution/v3/digestset" "github.com/opencontainers/go-digest" ) diff --git a/reference/normalize_test.go b/reference/normalize_test.go index a636236ee..b675309a7 100644 --- a/reference/normalize_test.go +++ b/reference/normalize_test.go @@ -4,7 +4,7 @@ import ( "strconv" "testing" - "github.com/docker/distribution/digestset" + "github.com/distribution/distribution/v3/digestset" "github.com/opencontainers/go-digest" ) diff --git a/reference/reference_test.go b/reference/reference_test.go index e077aa165..b91d5615c 100644 --- a/reference/reference_test.go +++ b/reference/reference_test.go @@ -102,7 +102,7 @@ func TestReferenceParse(t *testing.T) { err: ErrNameContainsUppercase, }, // FIXME "Uppercase" is incorrectly handled as a domain-name here, therefore passes. - // See https://github.com/docker/distribution/pull/1778, and https://github.com/docker/docker/pull/20175 + // See https://github.com/distribution/distribution/pull/1778, and https://github.com/docker/docker/pull/20175 //{ // input: "Uppercase/lowercase:tag", // err: ErrNameContainsUppercase, diff --git a/registry.go b/registry.go index 6c3210989..658f2df08 100644 --- a/registry.go +++ b/registry.go @@ -3,7 +3,7 @@ package distribution import ( "context" - "github.com/docker/distribution/reference" + "github.com/distribution/distribution/v3/reference" ) // Scope defines the set of items that match a namespace. diff --git a/registry/api/v2/descriptors.go b/registry/api/v2/descriptors.go index cffacc3c0..56bfdcdfb 100644 --- a/registry/api/v2/descriptors.go +++ b/registry/api/v2/descriptors.go @@ -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" ) diff --git a/registry/api/v2/errors.go b/registry/api/v2/errors.go index 97d6923aa..c413efbb0 100644 --- a/registry/api/v2/errors.go +++ b/registry/api/v2/errors.go @@ -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" diff --git a/registry/api/v2/urls.go b/registry/api/v2/urls.go index 876a190cb..075b430ea 100644 --- a/registry/api/v2/urls.go +++ b/registry/api/v2/urls.go @@ -6,7 +6,7 @@ import ( "net/url" "strings" - "github.com/docker/distribution/reference" + "github.com/distribution/distribution/v3/reference" "github.com/gorilla/mux" ) diff --git a/registry/api/v2/urls_test.go b/registry/api/v2/urls_test.go index fbf9d0d40..37b62ee50 100644 --- a/registry/api/v2/urls_test.go +++ b/registry/api/v2/urls_test.go @@ -7,7 +7,7 @@ import ( "reflect" "testing" - "github.com/docker/distribution/reference" + "github.com/distribution/distribution/v3/reference" ) type urlBuilderTestCase struct { diff --git a/registry/auth/htpasswd/access.go b/registry/auth/htpasswd/access.go index 2611a23be..f3d437171 100644 --- a/registry/auth/htpasswd/access.go +++ b/registry/auth/htpasswd/access.go @@ -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 { diff --git a/registry/auth/htpasswd/access_test.go b/registry/auth/htpasswd/access_test.go index 0bfc427e4..a5e235cc2 100644 --- a/registry/auth/htpasswd/access_test.go +++ b/registry/auth/htpasswd/access_test.go @@ -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) { diff --git a/registry/auth/htpasswd/htpasswd.go b/registry/auth/htpasswd/htpasswd.go index 832051609..56f31b6ee 100644 --- a/registry/auth/htpasswd/htpasswd.go +++ b/registry/auth/htpasswd/htpasswd.go @@ -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" ) diff --git a/registry/auth/silly/access.go b/registry/auth/silly/access.go index 3ead560df..11f0103b2 100644 --- a/registry/auth/silly/access.go +++ b/registry/auth/silly/access.go @@ -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 diff --git a/registry/auth/silly/access_test.go b/registry/auth/silly/access_test.go index 198244949..5ac8e02e2 100644 --- a/registry/auth/silly/access_test.go +++ b/registry/auth/silly/access_test.go @@ -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) { diff --git a/registry/auth/token/accesscontroller.go b/registry/auth/token/accesscontroller.go index fa924f0be..ec001ad1b 100644 --- a/registry/auth/token/accesscontroller.go +++ b/registry/auth/token/accesscontroller.go @@ -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" ) diff --git a/registry/auth/token/token.go b/registry/auth/token/token.go index 7f87d496f..2f86120a3 100644 --- a/registry/auth/token/token.go +++ b/registry/auth/token/token.go @@ -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 ( diff --git a/registry/auth/token/token_test.go b/registry/auth/token/token_test.go index 69f3e78b6..77250d4bd 100644 --- a/registry/auth/token/token_test.go +++ b/registry/auth/token/token_test.go @@ -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" ) diff --git a/registry/client/auth/session.go b/registry/client/auth/session.go index 5d2322f35..8a1723f61 100644 --- a/registry/client/auth/session.go +++ b/registry/client/auth/session.go @@ -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 ( diff --git a/registry/client/auth/session_test.go b/registry/client/auth/session_test.go index c857ec815..01e35c269 100644 --- a/registry/client/auth/session_test.go +++ b/registry/client/auth/session_test.go @@ -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. diff --git a/registry/client/blob_writer.go b/registry/client/blob_writer.go index cc6e88ca2..75ff20f9a 100644 --- a/registry/client/blob_writer.go +++ b/registry/client/blob_writer.go @@ -9,7 +9,7 @@ import ( "net/http" "time" - "github.com/docker/distribution" + "github.com/distribution/distribution/v3" ) type httpBlobUpload struct { diff --git a/registry/client/blob_writer_test.go b/registry/client/blob_writer_test.go index b70e08638..f7a6e7ca6 100644 --- a/registry/client/blob_writer_test.go +++ b/registry/client/blob_writer_test.go @@ -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 diff --git a/registry/client/errors.go b/registry/client/errors.go index 52d49d5d2..7e5d1236d 100644 --- a/registry/client/errors.go +++ b/registry/client/errors.go @@ -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 diff --git a/registry/client/repository.go b/registry/client/repository.go index 679d09cae..00b31a487 100644 --- a/registry/client/repository.go +++ b/registry/client/repository.go @@ -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" ) diff --git a/registry/client/repository_test.go b/registry/client/repository_test.go index 6dd331c8c..bd08bbd94 100644 --- a/registry/client/repository_test.go +++ b/registry/client/repository_test.go @@ -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" ) diff --git a/registry/handlers/api_test.go b/registry/handlers/api_test.go index 66aa06d6d..f53ba7c85 100644 --- a/registry/handlers/api_test.go +++ b/registry/handlers/api_test.go @@ -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" diff --git a/registry/handlers/app.go b/registry/handlers/app.go index f2be2b0d2..6ace01ac1 100644 --- a/registry/handlers/app.go +++ b/registry/handlers/app.go @@ -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" diff --git a/registry/handlers/app_test.go b/registry/handlers/app_test.go index 1135740d5..376e75262 100644 --- a/registry/handlers/app_test.go +++ b/registry/handlers/app_test.go @@ -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 diff --git a/registry/handlers/blob.go b/registry/handlers/blob.go index 515fdad0a..714b1166c 100644 --- a/registry/handlers/blob.go +++ b/registry/handlers/blob.go @@ -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" ) diff --git a/registry/handlers/blobupload.go b/registry/handlers/blobupload.go index d0351e3e4..edb9c11d8 100644 --- a/registry/handlers/blobupload.go +++ b/registry/handlers/blobupload.go @@ -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" ) diff --git a/registry/handlers/catalog.go b/registry/handlers/catalog.go index 15fb39511..d27b85ac3 100644 --- a/registry/handlers/catalog.go +++ b/registry/handlers/catalog.go @@ -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" ) diff --git a/registry/handlers/context.go b/registry/handlers/context.go index b1b7a13d3..cac97a04c 100644 --- a/registry/handlers/context.go +++ b/registry/handlers/context.go @@ -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" ) diff --git a/registry/handlers/health_test.go b/registry/handlers/health_test.go index 0f38bd1cd..045dbadcc 100644 --- a/registry/handlers/health_test.go +++ b/registry/handlers/health_test.go @@ -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) { diff --git a/registry/handlers/helpers.go b/registry/handlers/helpers.go index b02338e9b..2e89c65b8 100644 --- a/registry/handlers/helpers.go +++ b/registry/handlers/helpers.go @@ -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 diff --git a/registry/handlers/manifests.go b/registry/handlers/manifests.go index e71fe2c3d..ac56c209b 100644 --- a/registry/handlers/manifests.go +++ b/registry/handlers/manifests.go @@ -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" diff --git a/registry/handlers/tags.go b/registry/handlers/tags.go index 1e90642db..72d1dc8ff 100644 --- a/registry/handlers/tags.go +++ b/registry/handlers/tags.go @@ -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" ) diff --git a/registry/middleware/registry/middleware.go b/registry/middleware/registry/middleware.go index 49defd825..c9d80ef3c 100644 --- a/registry/middleware/registry/middleware.go +++ b/registry/middleware/registry/middleware.go @@ -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 diff --git a/registry/middleware/repository/middleware.go b/registry/middleware/repository/middleware.go index f1554b709..8c1cc8ef7 100644 --- a/registry/middleware/repository/middleware.go +++ b/registry/middleware/repository/middleware.go @@ -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 diff --git a/registry/proxy/proxyauth.go b/registry/proxy/proxyauth.go index 09a0973e6..07d80b48a 100644 --- a/registry/proxy/proxyauth.go +++ b/registry/proxy/proxyauth.go @@ -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" diff --git a/registry/proxy/proxyblobstore.go b/registry/proxy/proxyblobstore.go index bc13a34b6..013d20129 100644 --- a/registry/proxy/proxyblobstore.go +++ b/registry/proxy/proxyblobstore.go @@ -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" ) diff --git a/registry/proxy/proxyblobstore_test.go b/registry/proxy/proxyblobstore_test.go index 6e90dbe57..e95bf20cc 100644 --- a/registry/proxy/proxyblobstore_test.go +++ b/registry/proxy/proxyblobstore_test.go @@ -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" ) diff --git a/registry/proxy/proxymanifeststore.go b/registry/proxy/proxymanifeststore.go index 9b017a0ba..0b29386a7 100644 --- a/registry/proxy/proxymanifeststore.go +++ b/registry/proxy/proxymanifeststore.go @@ -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" ) diff --git a/registry/proxy/proxymanifeststore_test.go b/registry/proxy/proxymanifeststore_test.go index 82a1a2b75..8967e992c 100644 --- a/registry/proxy/proxymanifeststore_test.go +++ b/registry/proxy/proxymanifeststore_test.go @@ -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" ) diff --git a/registry/proxy/proxyregistry.go b/registry/proxy/proxyregistry.go index e8a8f3526..00f560daa 100644 --- a/registry/proxy/proxyregistry.go +++ b/registry/proxy/proxyregistry.go @@ -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 diff --git a/registry/proxy/proxytagservice.go b/registry/proxy/proxytagservice.go index 6a9256395..6bc08dba3 100644 --- a/registry/proxy/proxytagservice.go +++ b/registry/proxy/proxytagservice.go @@ -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. diff --git a/registry/proxy/proxytagservice_test.go b/registry/proxy/proxytagservice_test.go index 1314121e6..e0f99c0f9 100644 --- a/registry/proxy/proxytagservice_test.go +++ b/registry/proxy/proxytagservice_test.go @@ -7,7 +7,7 @@ import ( "sync" "testing" - "github.com/docker/distribution" + "github.com/distribution/distribution/v3" ) type mockTagStore struct { diff --git a/registry/proxy/scheduler/scheduler.go b/registry/proxy/scheduler/scheduler.go index f3c1caa03..8e5f4160c 100644 --- a/registry/proxy/scheduler/scheduler.go +++ b/registry/proxy/scheduler/scheduler.go @@ -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 diff --git a/registry/proxy/scheduler/scheduler_test.go b/registry/proxy/scheduler/scheduler_test.go index 4d69d5b55..15dfc86a6 100644 --- a/registry/proxy/scheduler/scheduler_test.go +++ b/registry/proxy/scheduler/scheduler_test.go @@ -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) { diff --git a/registry/registry.go b/registry/registry.go index 20190c115..95dc3caaa 100644 --- a/registry/registry.go +++ b/registry/registry.go @@ -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 diff --git a/registry/registry_test.go b/registry/registry_test.go index d8deb35e1..0e99c77ac 100644 --- a/registry/registry_test.go +++ b/registry/registry_test.go @@ -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: diff --git a/registry/root.go b/registry/root.go index 94d22f3c7..e32e0984c 100644 --- a/registry/root.go +++ b/registry/root.go @@ -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" ) diff --git a/registry/storage/blob_test.go b/registry/storage/blob_test.go index f5c1416d0..4589482cb 100644 --- a/registry/storage/blob_test.go +++ b/registry/storage/blob_test.go @@ -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" ) diff --git a/registry/storage/blobserver.go b/registry/storage/blobserver.go index 57d4f907b..6392e3554 100644 --- a/registry/storage/blobserver.go +++ b/registry/storage/blobserver.go @@ -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" ) diff --git a/registry/storage/blobstore.go b/registry/storage/blobstore.go index 1008aad8c..2e4d14c14 100644 --- a/registry/storage/blobstore.go +++ b/registry/storage/blobstore.go @@ -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" ) diff --git a/registry/storage/blobwriter.go b/registry/storage/blobwriter.go index 54c79b6f3..163e03a53 100644 --- a/registry/storage/blobwriter.go +++ b/registry/storage/blobwriter.go @@ -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" ) diff --git a/registry/storage/blobwriter_nonresumable.go b/registry/storage/blobwriter_nonresumable.go index 32f130974..3213f1443 100644 --- a/registry/storage/blobwriter_nonresumable.go +++ b/registry/storage/blobwriter_nonresumable.go @@ -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. diff --git a/registry/storage/blobwriter_resumable.go b/registry/storage/blobwriter_resumable.go index b970e8657..4cefe1efb 100644 --- a/registry/storage/blobwriter_resumable.go +++ b/registry/storage/blobwriter_resumable.go @@ -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" ) diff --git a/registry/storage/cache/cache.go b/registry/storage/cache/cache.go index 10a390919..0aa9dd4a8 100644 --- a/registry/storage/cache/cache.go +++ b/registry/storage/cache/cache.go @@ -5,7 +5,7 @@ package cache import ( "fmt" - "github.com/docker/distribution" + "github.com/distribution/distribution/v3" ) // BlobDescriptorCacheProvider provides repository scoped diff --git a/registry/storage/cache/cache_test.go b/registry/storage/cache/cache_test.go index 2e7f05566..f7e65be55 100644 --- a/registry/storage/cache/cache_test.go +++ b/registry/storage/cache/cache_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - "github.com/docker/distribution" + "github.com/distribution/distribution/v3" digest "github.com/opencontainers/go-digest" ) diff --git a/registry/storage/cache/cachecheck/suite.go b/registry/storage/cache/cachecheck/suite.go index 12d6e45de..5b92e8ac9 100644 --- a/registry/storage/cache/cachecheck/suite.go +++ b/registry/storage/cache/cachecheck/suite.go @@ -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" ) diff --git a/registry/storage/cache/cachedblobdescriptorstore.go b/registry/storage/cache/cachedblobdescriptorstore.go index f25d68d9f..b9131c54c 100644 --- a/registry/storage/cache/cachedblobdescriptorstore.go +++ b/registry/storage/cache/cachedblobdescriptorstore.go @@ -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" ) diff --git a/registry/storage/cache/memory/memory.go b/registry/storage/cache/memory/memory.go index 42d94d9bd..c2b1142ef 100644 --- a/registry/storage/cache/memory/memory.go +++ b/registry/storage/cache/memory/memory.go @@ -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" ) diff --git a/registry/storage/cache/memory/memory_test.go b/registry/storage/cache/memory/memory_test.go index 49c2b5c39..b09a18599 100644 --- a/registry/storage/cache/memory/memory_test.go +++ b/registry/storage/cache/memory/memory_test.go @@ -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 diff --git a/registry/storage/cache/metrics/prom.go b/registry/storage/cache/metrics/prom.go index 7b50e93fa..5401e12f0 100644 --- a/registry/storage/cache/metrics/prom.go +++ b/registry/storage/cache/metrics/prom.go @@ -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" ) diff --git a/registry/storage/cache/redis/redis.go b/registry/storage/cache/redis/redis.go index 5f84249bb..a4b317374 100644 --- a/registry/storage/cache/redis/redis.go +++ b/registry/storage/cache/redis/redis.go @@ -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" ) diff --git a/registry/storage/cache/redis/redis_test.go b/registry/storage/cache/redis/redis_test.go index 5f163a747..b69b9cc2e 100644 --- a/registry/storage/cache/redis/redis_test.go +++ b/registry/storage/cache/redis/redis_test.go @@ -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" ) diff --git a/registry/storage/catalog.go b/registry/storage/catalog.go index a903fb393..55500694d 100644 --- a/registry/storage/catalog.go +++ b/registry/storage/catalog.go @@ -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. diff --git a/registry/storage/catalog_test.go b/registry/storage/catalog_test.go index 901d14a34..971657581 100644 --- a/registry/storage/catalog_test.go +++ b/registry/storage/catalog_test.go @@ -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" ) diff --git a/registry/storage/driver/azure/azure.go b/registry/storage/driver/azure/azure.go index 58c6293b2..e39897e06 100644 --- a/registry/storage/driver/azure/azure.go +++ b/registry/storage/driver/azure/azure.go @@ -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. diff --git a/registry/storage/driver/azure/azure_test.go b/registry/storage/driver/azure/azure_test.go index 4a0661b3e..c80d80d63 100644 --- a/registry/storage/driver/azure/azure_test.go +++ b/registry/storage/driver/azure/azure_test.go @@ -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" ) diff --git a/registry/storage/driver/base/base.go b/registry/storage/driver/base/base.go index 4511f0021..ff7803405 100644 --- a/registry/storage/driver/base/base.go +++ b/registry/storage/driver/base/base.go @@ -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" ) diff --git a/registry/storage/driver/base/regulator.go b/registry/storage/driver/base/regulator.go index 9c5e6cc41..1c42a33eb 100644 --- a/registry/storage/driver/base/regulator.go +++ b/registry/storage/driver/base/regulator.go @@ -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 { diff --git a/registry/storage/driver/factory/factory.go b/registry/storage/driver/factory/factory.go index a9c04ec59..3a4b57ce5 100644 --- a/registry/storage/driver/factory/factory.go +++ b/registry/storage/driver/factory/factory.go @@ -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 { diff --git a/registry/storage/driver/filesystem/driver.go b/registry/storage/driver/filesystem/driver.go index ef6cc9721..0f7b66600 100644 --- a/registry/storage/driver/filesystem/driver.go +++ b/registry/storage/driver/filesystem/driver.go @@ -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 ( diff --git a/registry/storage/driver/filesystem/driver_test.go b/registry/storage/driver/filesystem/driver_test.go index 2bf5b2d18..7c689de7b 100644 --- a/registry/storage/driver/filesystem/driver_test.go +++ b/registry/storage/driver/filesystem/driver_test.go @@ -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" ) diff --git a/registry/storage/driver/gcs/gcs.go b/registry/storage/driver/gcs/gcs.go index 7931239ea..9353e65f2 100644 --- a/registry/storage/driver/gcs/gcs.go +++ b/registry/storage/driver/gcs/gcs.go @@ -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" diff --git a/registry/storage/driver/gcs/gcs_test.go b/registry/storage/driver/gcs/gcs_test.go index e58216be0..aae0e3a3d 100644 --- a/registry/storage/driver/gcs/gcs_test.go +++ b/registry/storage/driver/gcs/gcs_test.go @@ -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" diff --git a/registry/storage/driver/inmemory/driver.go b/registry/storage/driver/inmemory/driver.go index 4b1f5f48d..e1d9ccfe3 100644 --- a/registry/storage/driver/inmemory/driver.go +++ b/registry/storage/driver/inmemory/driver.go @@ -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" diff --git a/registry/storage/driver/inmemory/driver_test.go b/registry/storage/driver/inmemory/driver_test.go index dbc1916f9..64d6fafdb 100644 --- a/registry/storage/driver/inmemory/driver_test.go +++ b/registry/storage/driver/inmemory/driver_test.go @@ -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" ) diff --git a/registry/storage/driver/middleware/alicdn/middleware.go b/registry/storage/driver/middleware/alicdn/middleware.go index 51993161c..33d51c261 100755 --- a/registry/storage/driver/middleware/alicdn/middleware.go +++ b/registry/storage/driver/middleware/alicdn/middleware.go @@ -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" ) diff --git a/registry/storage/driver/middleware/cloudfront/middleware.go b/registry/storage/driver/middleware/cloudfront/middleware.go index a29d39259..2b680a1fb 100644 --- a/registry/storage/driver/middleware/cloudfront/middleware.go +++ b/registry/storage/driver/middleware/cloudfront/middleware.go @@ -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 diff --git a/registry/storage/driver/middleware/cloudfront/s3filter.go b/registry/storage/driver/middleware/cloudfront/s3filter.go index c8c7f5703..aa93b861b 100644 --- a/registry/storage/driver/middleware/cloudfront/s3filter.go +++ b/registry/storage/driver/middleware/cloudfront/s3filter.go @@ -11,7 +11,7 @@ import ( "sync" "time" - dcontext "github.com/docker/distribution/context" + dcontext "github.com/distribution/distribution/v3/context" ) const ( diff --git a/registry/storage/driver/middleware/cloudfront/s3filter_test.go b/registry/storage/driver/middleware/cloudfront/s3filter_test.go index 7ff60fda4..84e186b3f 100644 --- a/registry/storage/driver/middleware/cloudfront/s3filter_test.go +++ b/registry/storage/driver/middleware/cloudfront/s3filter_test.go @@ -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 ) diff --git a/registry/storage/driver/middleware/redirect/middleware.go b/registry/storage/driver/middleware/redirect/middleware.go index 8f63674c6..f36187789 100644 --- a/registry/storage/driver/middleware/redirect/middleware.go +++ b/registry/storage/driver/middleware/redirect/middleware.go @@ -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 { diff --git a/registry/storage/driver/middleware/storagemiddleware.go b/registry/storage/driver/middleware/storagemiddleware.go index 7e40a8dd9..bde645dc5 100644 --- a/registry/storage/driver/middleware/storagemiddleware.go +++ b/registry/storage/driver/middleware/storagemiddleware.go @@ -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 diff --git a/registry/storage/driver/oss/oss.go b/registry/storage/driver/oss/oss.go index 5cd96203f..c8c38a4ae 100644 --- a/registry/storage/driver/oss/oss.go +++ b/registry/storage/driver/oss/oss.go @@ -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" ) diff --git a/registry/storage/driver/oss/oss_test.go b/registry/storage/driver/oss/oss_test.go index d415115a0..29165801c 100644 --- a/registry/storage/driver/oss/oss_test.go +++ b/registry/storage/driver/oss/oss_test.go @@ -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" ) diff --git a/registry/storage/driver/s3-aws/s3.go b/registry/storage/driver/s3-aws/s3.go index 5a4541cd0..d06e8351c 100644 --- a/registry/storage/driver/s3-aws/s3.go +++ b/registry/storage/driver/s3-aws/s3.go @@ -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" diff --git a/registry/storage/driver/s3-aws/s3_test.go b/registry/storage/driver/s3-aws/s3_test.go index dec479166..30bd4c97e 100644 --- a/registry/storage/driver/s3-aws/s3_test.go +++ b/registry/storage/driver/s3-aws/s3_test.go @@ -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. diff --git a/registry/storage/driver/storagedriver.go b/registry/storage/driver/storagedriver.go index b220713f2..9a9b9a8f4 100644 --- a/registry/storage/driver/storagedriver.go +++ b/registry/storage/driver/storagedriver.go @@ -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 { diff --git a/registry/storage/driver/swift/swift.go b/registry/storage/driver/swift/swift.go index b64e3b66c..65072581a 100644 --- a/registry/storage/driver/swift/swift.go +++ b/registry/storage/driver/swift/swift.go @@ -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" diff --git a/registry/storage/driver/swift/swift_test.go b/registry/storage/driver/swift/swift_test.go index 17007c190..f3edfd5d0 100644 --- a/registry/storage/driver/swift/swift_test.go +++ b/registry/storage/driver/swift/swift_test.go @@ -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" ) diff --git a/registry/storage/driver/testdriver/testdriver.go b/registry/storage/driver/testdriver/testdriver.go index 91254627b..9ea83d4a3 100644 --- a/registry/storage/driver/testdriver/testdriver.go +++ b/registry/storage/driver/testdriver/testdriver.go @@ -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" diff --git a/registry/storage/driver/testsuites/testsuites.go b/registry/storage/driver/testsuites/testsuites.go index 99c54078e..541d9745b 100644 --- a/registry/storage/driver/testsuites/testsuites.go +++ b/registry/storage/driver/testsuites/testsuites.go @@ -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" ) diff --git a/registry/storage/filereader.go b/registry/storage/filereader.go index 90afaad0a..031204bd7 100644 --- a/registry/storage/filereader.go +++ b/registry/storage/filereader.go @@ -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 diff --git a/registry/storage/filereader_test.go b/registry/storage/filereader_test.go index 305366f43..71e57bd7b 100644 --- a/registry/storage/filereader_test.go +++ b/registry/storage/filereader_test.go @@ -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" ) diff --git a/registry/storage/garbagecollect.go b/registry/storage/garbagecollect.go index 317c792da..13c9b180c 100644 --- a/registry/storage/garbagecollect.go +++ b/registry/storage/garbagecollect.go @@ -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" ) diff --git a/registry/storage/garbagecollect_test.go b/registry/storage/garbagecollect_test.go index c4e5a516e..25c5e2f8f 100644 --- a/registry/storage/garbagecollect_test.go +++ b/registry/storage/garbagecollect_test.go @@ -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" ) diff --git a/registry/storage/io.go b/registry/storage/io.go index f79e7a6f2..cd63bb92d 100644 --- a/registry/storage/io.go +++ b/registry/storage/io.go @@ -6,7 +6,7 @@ import ( "io" "io/ioutil" - "github.com/docker/distribution/registry/storage/driver" + "github.com/distribution/distribution/v3/registry/storage/driver" ) const ( diff --git a/registry/storage/linkedblobstore.go b/registry/storage/linkedblobstore.go index de591c8a5..89573ddc7 100644 --- a/registry/storage/linkedblobstore.go +++ b/registry/storage/linkedblobstore.go @@ -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" ) diff --git a/registry/storage/linkedblobstore_test.go b/registry/storage/linkedblobstore_test.go index 55dccd13f..b08d4dced 100644 --- a/registry/storage/linkedblobstore_test.go +++ b/registry/storage/linkedblobstore_test.go @@ -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" ) diff --git a/registry/storage/manifestlisthandler.go b/registry/storage/manifestlisthandler.go index ffc391617..e9c71d4c0 100644 --- a/registry/storage/manifestlisthandler.go +++ b/registry/storage/manifestlisthandler.go @@ -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" ) diff --git a/registry/storage/manifeststore.go b/registry/storage/manifeststore.go index 7daa9a729..0daa92dfe 100644 --- a/registry/storage/manifeststore.go +++ b/registry/storage/manifeststore.go @@ -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" ) diff --git a/registry/storage/manifeststore_test.go b/registry/storage/manifeststore_test.go index 54b58ae1d..769136493 100644 --- a/registry/storage/manifeststore_test.go +++ b/registry/storage/manifeststore_test.go @@ -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" diff --git a/registry/storage/ocimanifesthandler.go b/registry/storage/ocimanifesthandler.go index e06ecb113..242ae7587 100644 --- a/registry/storage/ocimanifesthandler.go +++ b/registry/storage/ocimanifesthandler.go @@ -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" ) diff --git a/registry/storage/ocimanifesthandler_test.go b/registry/storage/ocimanifesthandler_test.go index ed019efd0..d8a74b8a2 100644 --- a/registry/storage/ocimanifesthandler_test.go +++ b/registry/storage/ocimanifesthandler_test.go @@ -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" ) diff --git a/registry/storage/purgeuploads.go b/registry/storage/purgeuploads.go index cac921210..b22857db9 100644 --- a/registry/storage/purgeuploads.go +++ b/registry/storage/purgeuploads.go @@ -6,8 +6,8 @@ import ( "strings" "time" - storageDriver "github.com/docker/distribution/registry/storage/driver" - "github.com/docker/distribution/uuid" + storageDriver "github.com/distribution/distribution/v3/registry/storage/driver" + "github.com/distribution/distribution/v3/uuid" "github.com/sirupsen/logrus" ) diff --git a/registry/storage/purgeuploads_test.go b/registry/storage/purgeuploads_test.go index 398df2b68..7ee127c09 100644 --- a/registry/storage/purgeuploads_test.go +++ b/registry/storage/purgeuploads_test.go @@ -7,9 +7,9 @@ import ( "testing" "time" - "github.com/docker/distribution/registry/storage/driver" - "github.com/docker/distribution/registry/storage/driver/inmemory" - "github.com/docker/distribution/uuid" + "github.com/distribution/distribution/v3/registry/storage/driver" + "github.com/distribution/distribution/v3/registry/storage/driver/inmemory" + "github.com/distribution/distribution/v3/uuid" ) func testUploadFS(t *testing.T, numUploads int, repoName string, startedAt time.Time) (driver.StorageDriver, context.Context) { diff --git a/registry/storage/registry.go b/registry/storage/registry.go index d74403f50..45939083f 100644 --- a/registry/storage/registry.go +++ b/registry/storage/registry.go @@ -4,10 +4,10 @@ import ( "context" "regexp" - "github.com/docker/distribution" - "github.com/docker/distribution/reference" - "github.com/docker/distribution/registry/storage/cache" - storagedriver "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/cache" + storagedriver "github.com/distribution/distribution/v3/registry/storage/driver" "github.com/docker/libtrust" ) diff --git a/registry/storage/schema2manifesthandler.go b/registry/storage/schema2manifesthandler.go index 3e32e9f4c..fa4656232 100644 --- a/registry/storage/schema2manifesthandler.go +++ b/registry/storage/schema2manifesthandler.go @@ -6,10 +6,10 @@ import ( "fmt" "net/url" - "github.com/docker/distribution" - dcontext "github.com/docker/distribution/context" - "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/schema1" + "github.com/distribution/distribution/v3/manifest/schema2" "github.com/opencontainers/go-digest" ) diff --git a/registry/storage/schema2manifesthandler_test.go b/registry/storage/schema2manifesthandler_test.go index 6536f9d3c..ce4717ae4 100644 --- a/registry/storage/schema2manifesthandler_test.go +++ b/registry/storage/schema2manifesthandler_test.go @@ -4,11 +4,11 @@ import ( "regexp" "testing" - "github.com/docker/distribution" - "github.com/docker/distribution/context" - "github.com/docker/distribution/manifest" - "github.com/docker/distribution/manifest/schema2" - "github.com/docker/distribution/registry/storage/driver/inmemory" + "github.com/distribution/distribution/v3" + "github.com/distribution/distribution/v3/context" + "github.com/distribution/distribution/v3/manifest" + "github.com/distribution/distribution/v3/manifest/schema2" + "github.com/distribution/distribution/v3/registry/storage/driver/inmemory" ) func TestVerifyManifestForeignLayer(t *testing.T) { diff --git a/registry/storage/signedmanifesthandler.go b/registry/storage/signedmanifesthandler.go index f94ecbea5..eb5b5742a 100644 --- a/registry/storage/signedmanifesthandler.go +++ b/registry/storage/signedmanifesthandler.go @@ -5,10 +5,10 @@ import ( "encoding/json" "fmt" - "github.com/docker/distribution" - dcontext "github.com/docker/distribution/context" - "github.com/docker/distribution/manifest/schema1" - "github.com/docker/distribution/reference" + "github.com/distribution/distribution/v3" + dcontext "github.com/distribution/distribution/v3/context" + "github.com/distribution/distribution/v3/manifest/schema1" + "github.com/distribution/distribution/v3/reference" "github.com/docker/libtrust" "github.com/opencontainers/go-digest" ) diff --git a/registry/storage/tagstore.go b/registry/storage/tagstore.go index 3bc3f5acf..e33bf9da7 100644 --- a/registry/storage/tagstore.go +++ b/registry/storage/tagstore.go @@ -4,8 +4,8 @@ import ( "context" "path" - "github.com/docker/distribution" - storagedriver "github.com/docker/distribution/registry/storage/driver" + "github.com/distribution/distribution/v3" + storagedriver "github.com/distribution/distribution/v3/registry/storage/driver" "github.com/opencontainers/go-digest" ) diff --git a/registry/storage/tagstore_test.go b/registry/storage/tagstore_test.go index 6f4c6c915..dca486fdb 100644 --- a/registry/storage/tagstore_test.go +++ b/registry/storage/tagstore_test.go @@ -5,11 +5,11 @@ import ( "reflect" "testing" - "github.com/docker/distribution" - "github.com/docker/distribution/manifest" - "github.com/docker/distribution/manifest/schema2" - "github.com/docker/distribution/reference" - "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/schema2" + "github.com/distribution/distribution/v3/reference" + "github.com/distribution/distribution/v3/registry/storage/driver/inmemory" digest "github.com/opencontainers/go-digest" ) diff --git a/registry/storage/v1unsupportedhandler.go b/registry/storage/v1unsupportedhandler.go index fb6ca14e3..8170646bc 100644 --- a/registry/storage/v1unsupportedhandler.go +++ b/registry/storage/v1unsupportedhandler.go @@ -3,7 +3,7 @@ package storage import ( "context" - "github.com/docker/distribution" + "github.com/distribution/distribution/v3" digest "github.com/opencontainers/go-digest" ) diff --git a/registry/storage/vacuum.go b/registry/storage/vacuum.go index a43db17a4..749fb3190 100644 --- a/registry/storage/vacuum.go +++ b/registry/storage/vacuum.go @@ -4,8 +4,8 @@ import ( "context" "path" - dcontext "github.com/docker/distribution/context" - "github.com/docker/distribution/registry/storage/driver" + dcontext "github.com/distribution/distribution/v3/context" + "github.com/distribution/distribution/v3/registry/storage/driver" "github.com/opencontainers/go-digest" ) diff --git a/releases/README.md b/releases/README.md index 7af9e97b2..b973e8699 100644 --- a/releases/README.md +++ b/releases/README.md @@ -9,7 +9,7 @@ See https://github.com/containerd/containerd/tree/master/cmd/containerd-release 20. Update the `.mailmap` files. -30. Update the version file: `https://github.com/docker/distribution/blob/master/version/version.go` +30. Update the version file: `https://github.com/distribution/distribution/blob/master/version/version.go` 40. Create a signed tag. @@ -26,11 +26,11 @@ hash. 50. Push the signed tag -60. Create a new [release](https://github.com/docker/distribution/releases). +60. Create a new [release](https://github.com/distribution/distribution/releases). In the case of a release candidate, tick the `pre-release` checkbox. Use the generate release notes from the release tool -70. Update the registry binary in the [distribution library image repo](https://github.com/docker/distribution-library-image) by running the update script and opening a pull request. +70. Update the registry binary in the [distribution library image repo](https://github.com/distribution/distribution-library-image) by running the update script and opening a pull request. 80. Update the official image. Add the new version in the [official images repo](https://github.com/docker-library/official-images) by appending a new version to the `registry/registry` file with the git hash pointed to by the signed tag. Update the major version to point to the latest version and the minor version to point to new patch release if necessary. e.g. to release `2.3.1` diff --git a/releases/v2.7.0.toml b/releases/v2.7.0.toml index 89bcbbd55..9758b76bd 100644 --- a/releases/v2.7.0.toml +++ b/releases/v2.7.0.toml @@ -2,7 +2,7 @@ commit = "HEAD" project_name = "registry" -github_repo = "docker/distribution" +github_repo = "distribution/distribution" # previous release previous = "v2.6.0" diff --git a/testutil/manifests.go b/testutil/manifests.go index 8afe82e48..cf80bb47b 100644 --- a/testutil/manifests.go +++ b/testutil/manifests.go @@ -3,12 +3,12 @@ package testutil import ( "fmt" - "github.com/docker/distribution" - "github.com/docker/distribution/context" - "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/distribution/distribution/v3" + "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/schema1" + "github.com/distribution/distribution/v3/manifest/schema2" "github.com/docker/libtrust" "github.com/opencontainers/go-digest" ) diff --git a/testutil/tarfile.go b/testutil/tarfile.go index 2ebd364a2..99e1dfcde 100644 --- a/testutil/tarfile.go +++ b/testutil/tarfile.go @@ -8,8 +8,8 @@ import ( mrand "math/rand" "time" - "github.com/docker/distribution" - "github.com/docker/distribution/context" + "github.com/distribution/distribution/v3" + "github.com/distribution/distribution/v3/context" "github.com/opencontainers/go-digest" ) diff --git a/version/print.go b/version/print.go index a82bce39f..e4658ecf7 100644 --- a/version/print.go +++ b/version/print.go @@ -11,10 +11,10 @@ import ( // // // -// For example, a binary "registry" built from github.com/docker/distribution +// For example, a binary "registry" built from github.com/distribution/distribution // with version "v2.0" would print the following: // -// registry github.com/docker/distribution v2.0 +// registry github.com/distribution/distribution v2.0 // func FprintVersion(w io.Writer) { fmt.Fprintln(w, os.Args[0], Package, Version) diff --git a/version/version.go b/version/version.go index d05a377e4..43c869002 100644 --- a/version/version.go +++ b/version/version.go @@ -2,13 +2,13 @@ package version // Package is the overall, canonical project import path under which the // package was built. -var Package = "github.com/docker/distribution" +var Package = "github.com/distribution/distribution/v3" // Version indicates which version of the binary is running. This is set to // the latest release tag by hand, always suffixed by "+unknown". During // build, it will be replaced by the actual version. The value here will be // used if the registry is run after a go get based install. -var Version = "v2.7.0+unknown" +var Version = "v3.0.0+unknown" // Revision is filled with the VCS (e.g. git) revision being used to build // the program at linking time.