go mod tidy and rename to docker/distribution

digitalocean · Aug 16, 2023 · 3f8ce75 · 3f8ce75
1 parent 7467c19
commit 3f8ce75
Show file tree

Hide file tree

Showing 154 changed files with 521 additions and 521 deletions.
diff --git a/BUILDING.md b/BUILDING.md
@@ -53,7 +53,7 @@ The `registry`
 binary can then be run with the following:
 
     $ ./bin/registry --version
-    ./bin/registry github.com/distribution/distribution/v3 v2.7.0-1993-g8857a194
+    ./bin/registry github.com/docker/distribution v2.7.0-1993-g8857a194
 
 The registry can be run with a development config using the following
 incantation:

diff --git a/Dockerfile b/Dockerfile
@@ -13,7 +13,7 @@ ENV CGO_ENABLED=0
 WORKDIR /src
 
 FROM base AS version
-ARG PKG=github.com/distribution/distribution/v3
+ARG PKG=github.com/docker/distribution
 RUN --mount=target=. \
   VERSION=$(git describe --match 'v[0-9]*' --dirty='.m' --always --tags) REVISION=$(git rev-parse HEAD)$(if ! git diff --no-ext-diff --quiet --exit-code; then echo .m; fi); \
   echo "-X ${PKG}/version.Version=${VERSION#v} -X ${PKG}/version.Revision=${REVISION} -X ${PKG}/version.Package=${PKG}" | tee /tmp/.ldflags; \

diff --git 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/distribution/distribution/v3
+PKG=github.com/docker/distribution
 
 # Project packages.
 PACKAGES=$(shell go list -tags "${BUILDTAGS}" ./... | grep -v /vendor/)

diff --git a/blobs.go b/blobs.go
@@ -8,7 +8,7 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/distribution/distribution/v3/reference"
+	"github.com/docker/distribution/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
@@ -7,7 +7,7 @@ import (
 	"log"
 	"os"
 
-	"github.com/distribution/distribution/v3/version"
+	"github.com/docker/distribution/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
@@ -20,8 +20,8 @@ import (
 	"regexp"
 	"text/template"
 
-	"github.com/distribution/distribution/v3/registry/api/errcode"
-	v2 "github.com/distribution/distribution/v3/registry/api/v2"
+	"github.com/docker/distribution/registry/api/errcode"
+	v2 "github.com/docker/distribution/registry/api/v2"
 )
 
 var spaceRegex = regexp.MustCompile(`\n\s*`)

diff --git a/cmd/registry/main.go b/cmd/registry/main.go
@@ -3,20 +3,20 @@ package main
 import (
 	_ "net/http/pprof"
 
-	"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/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"
 )
 
 func main() {

diff --git a/context/context.go b/context/context.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"sync"
 
-	"github.com/distribution/distribution/v3/uuid"
+	"github.com/docker/distribution/uuid"
 )
 
 // instanceContext is a context that provides only an instance id. It is

diff --git a/context/http.go b/context/http.go
@@ -9,7 +9,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/distribution/distribution/v3/uuid"
+	"github.com/docker/distribution/uuid"
 	"github.com/gorilla/mux"
 	log "github.com/sirupsen/logrus"
 )

diff --git a/context/trace.go b/context/trace.go
@@ -5,7 +5,7 @@ import (
 	"runtime"
 	"time"
 
-	"github.com/distribution/distribution/v3/uuid"
+	"github.com/docker/distribution/uuid"
 )
 
 // WithTrace allocates a traced timing span in a new context. This allows a

diff --git a/contrib/token-server/errors.go b/contrib/token-server/errors.go
@@ -3,7 +3,7 @@ package main
 import (
 	"net/http"
 
-	"github.com/distribution/distribution/v3/registry/api/errcode"
+	"github.com/docker/distribution/registry/api/errcode"
 )
 
 var (

diff --git a/contrib/token-server/main.go b/contrib/token-server/main.go
@@ -11,10 +11,10 @@ import (
 	"strings"
 	"time"
 
-	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"
+	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"
 	"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
@@ -12,9 +12,9 @@ import (
 	"strings"
 	"time"
 
-	dcontext "github.com/distribution/distribution/v3/context"
-	"github.com/distribution/distribution/v3/registry/auth"
-	"github.com/distribution/distribution/v3/registry/auth/token"
+	dcontext "github.com/docker/distribution/context"
+	"github.com/docker/distribution/registry/auth"
+	"github.com/docker/distribution/registry/auth/token"
 	"github.com/docker/libtrust"
 )
 

diff --git a/contrib/token-server/token_test.go b/contrib/token-server/token_test.go
@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/distribution/distribution/v3/registry/auth"
+	"github.com/docker/distribution/registry/auth"
 	"github.com/docker/libtrust"
 )
 

diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/distribution/distribution/v3
+module github.com/docker/distribution
 
 go 1.18
 

diff --git a/health/api/api.go b/health/api/api.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"net/http"
 
-	"github.com/distribution/distribution/v3/health"
+	"github.com/docker/distribution/health"
 )
 
 var updater = health.NewStatusUpdater()

diff --git a/health/api/api_test.go b/health/api/api_test.go
@@ -5,7 +5,7 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/distribution/distribution/v3/health"
+	"github.com/docker/distribution/health"
 )
 
 // TestGETDownHandlerDoesNotChangeStatus ensures that calling the endpoint

diff --git a/health/checks/checks.go b/health/checks/checks.go
@@ -10,7 +10,7 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/distribution/distribution/v3/health"
+	"github.com/docker/distribution/health"
 )
 
 // FileChecker checks the existence of a file and returns an error

diff --git a/health/doc.go b/health/doc.go
@@ -17,14 +17,14 @@
 //
 // To install health, just import it in your application:
 //
-//	import "github.com/distribution/distribution/v3/health"
+//	import "github.com/docker/distribution/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/distribution/distribution/v3/health/api"
+//	import _ "github.com/docker/distribution/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/distribution/distribution/v3/health/checks
+//	import "github.com/docker/distribution/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
@@ -7,8 +7,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/distribution/distribution/v3/context"
-	"github.com/distribution/distribution/v3/registry/api/errcode"
+	"github.com/docker/distribution/context"
+	"github.com/docker/distribution/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
@@ -5,8 +5,8 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/distribution/distribution/v3"
-	"github.com/distribution/distribution/v3/manifest"
+	"github.com/docker/distribution"
+	"github.com/docker/distribution/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
@@ -6,8 +6,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/distribution/distribution/v3"
-	"github.com/distribution/distribution/v3/manifest/schema2"
+	"github.com/docker/distribution"
+	"github.com/docker/distribution/manifest/schema2"
 
 	v1 "github.com/opencontainers/image-spec/specs-go/v1"
 )

diff --git a/manifest/ocischema/builder.go b/manifest/ocischema/builder.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"errors"
 
-	"github.com/distribution/distribution/v3"
-	"github.com/distribution/distribution/v3/manifest"
+	"github.com/docker/distribution"
+	"github.com/docker/distribution/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
@@ -5,7 +5,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/distribution/distribution/v3"
+	"github.com/docker/distribution"
 	"github.com/opencontainers/go-digest"
 	v1 "github.com/opencontainers/image-spec/specs-go/v1"
 )

diff --git a/manifest/ocischema/index.go b/manifest/ocischema/index.go
@@ -5,8 +5,8 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/distribution/distribution/v3"
-	"github.com/distribution/distribution/v3/manifest"
+	"github.com/docker/distribution"
+	"github.com/docker/distribution/manifest"
 	"github.com/opencontainers/go-digest"
 	v1 "github.com/opencontainers/image-spec/specs-go/v1"
 )

diff --git a/manifest/ocischema/index_test.go b/manifest/ocischema/index_test.go
@@ -6,8 +6,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/distribution/distribution/v3"
-	"github.com/distribution/distribution/v3/manifest/schema2"
+	"github.com/docker/distribution"
+	"github.com/docker/distribution/manifest/schema2"
 	v1 "github.com/opencontainers/image-spec/specs-go/v1"
 )
 

diff --git a/manifest/ocischema/manifest.go b/manifest/ocischema/manifest.go
@@ -5,8 +5,8 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/distribution/distribution/v3"
-	"github.com/distribution/distribution/v3/manifest"
+	"github.com/docker/distribution"
+	"github.com/docker/distribution/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
@@ -6,9 +6,9 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/distribution/distribution/v3"
-	"github.com/distribution/distribution/v3/manifest"
-	"github.com/distribution/distribution/v3/manifest/manifestlist"
+	"github.com/docker/distribution"
+	"github.com/docker/distribution/manifest"
+	"github.com/docker/distribution/manifest/manifestlist"
 
 	v1 "github.com/opencontainers/image-spec/specs-go/v1"
 )

diff --git a/manifest/schema1/config_builder.go b/manifest/schema1/config_builder.go
@@ -8,9 +8,9 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/distribution/distribution/v3"
-	"github.com/distribution/distribution/v3/manifest"
-	"github.com/distribution/distribution/v3/reference"
+	"github.com/docker/distribution"
+	"github.com/docker/distribution/manifest"
+	"github.com/docker/distribution/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
@@ -8,9 +8,9 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/distribution/distribution/v3"
-	dcontext "github.com/distribution/distribution/v3/context"
-	"github.com/distribution/distribution/v3/reference"
+	"github.com/docker/distribution"
+	dcontext "github.com/docker/distribution/context"
+	"github.com/docker/distribution/reference"
 	"github.com/docker/libtrust"
 	"github.com/opencontainers/go-digest"
 )

diff --git a/manifest/schema1/manifest.go b/manifest/schema1/manifest.go
@@ -10,8 +10,8 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/distribution/distribution/v3"
-	"github.com/distribution/distribution/v3/manifest"
+	"github.com/docker/distribution"
+	"github.com/docker/distribution/manifest"
 	"github.com/docker/libtrust"
 	"github.com/opencontainers/go-digest"
 )

diff --git a/manifest/schema1/reference_builder.go b/manifest/schema1/reference_builder.go
@@ -5,9 +5,9 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/distribution/distribution/v3"
-	"github.com/distribution/distribution/v3/manifest"
-	"github.com/distribution/distribution/v3/reference"
+	"github.com/docker/distribution"
+	"github.com/docker/distribution/manifest"
+	"github.com/docker/distribution/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
@@ -3,9 +3,9 @@ package schema1
 import (
 	"testing"
 
-	"github.com/distribution/distribution/v3/context"
-	"github.com/distribution/distribution/v3/manifest"
-	"github.com/distribution/distribution/v3/reference"
+	"github.com/docker/distribution/context"
+	"github.com/docker/distribution/manifest"
+	"github.com/docker/distribution/reference"
 	"github.com/docker/libtrust"
 	"github.com/opencontainers/go-digest"
 )

diff --git a/manifest/schema2/builder.go b/manifest/schema2/builder.go
@@ -3,7 +3,7 @@ package schema2
 import (
 	"context"
 
-	"github.com/distribution/distribution/v3"
+	"github.com/docker/distribution"
 )
 
 // builder is a type for constructing manifests.