Merge pull request #2 from docker/fix-refs

Move from docker-registry to distribution

Dockerfile

@@ -1,10 +1,10 @@
 FROM golang
 
-COPY . /go/src/github.com/docker/docker-registry
+COPY . /go/src/github.com/docker/distribution
 
 # Fetch any dependencies to run the registry
-RUN go get github.com/docker/docker-registry/...
-RUN go install github.com/docker/docker-registry/cmd/registry
+RUN go get github.com/docker/distribution/...
+RUN go install github.com/docker/distribution/cmd/registry
 
 ENV CONFIG_PATH /etc/docker/registry/config.yml
 COPY ./cmd/registry/config.yml $CONFIG_PATH

api/v2/descriptors.go

@@ -4,8 +4,8 @@ import (
 	"net/http"
 	"regexp"
 
-	"github.com/docker/docker-registry/common"
-	"github.com/docker/docker-registry/digest"
+	"github.com/docker/distribution/common"
+	"github.com/docker/distribution/digest"
 )
 
 var (

api/v2/errors_test.go

@@ -5,7 +5,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/docker/docker-registry/digest"
+	"github.com/docker/distribution/digest"
 )
 
 // TestErrorCodes ensures that error code format, mappings and

api/v2/urls.go

@@ -4,7 +4,7 @@ import (
 	"net/http"
 	"net/url"
 
-	"github.com/docker/docker-registry/digest"
+	"github.com/docker/distribution/digest"
 	"github.com/gorilla/mux"
 )
 

api_test.go

@@ -13,12 +13,12 @@ import (
 	"os"
 	"testing"
 
-	"github.com/docker/docker-registry/api/v2"
-	"github.com/docker/docker-registry/common/testutil"
-	"github.com/docker/docker-registry/configuration"
-	"github.com/docker/docker-registry/digest"
-	"github.com/docker/docker-registry/storage"
-	_ "github.com/docker/docker-registry/storagedriver/inmemory"
+	"github.com/docker/distribution/api/v2"
+	"github.com/docker/distribution/common/testutil"
+	"github.com/docker/distribution/configuration"
+	"github.com/docker/distribution/digest"
+	"github.com/docker/distribution/storage"
+	_ "github.com/docker/distribution/storagedriver/inmemory"
 	"github.com/docker/libtrust"
 	"github.com/gorilla/handlers"
 )

app.go

@@ -4,12 +4,12 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/docker/docker-registry/api/v2"
-	"github.com/docker/docker-registry/auth"
-	"github.com/docker/docker-registry/configuration"
-	"github.com/docker/docker-registry/storage"
-	"github.com/docker/docker-registry/storagedriver"
-	"github.com/docker/docker-registry/storagedriver/factory"
+	"github.com/docker/distribution/api/v2"
+	"github.com/docker/distribution/auth"
+	"github.com/docker/distribution/configuration"
+	"github.com/docker/distribution/storage"
+	"github.com/docker/distribution/storagedriver"
+	"github.com/docker/distribution/storagedriver/factory"
 
 	log "github.com/Sirupsen/logrus"
 	"github.com/gorilla/mux"

app_test.go

@@ -7,9 +7,9 @@ import (
 	"net/url"
 	"testing"
 
-	"github.com/docker/docker-registry/api/v2"
-	_ "github.com/docker/docker-registry/auth/silly"
-	"github.com/docker/docker-registry/configuration"
+	"github.com/docker/distribution/api/v2"
+	_ "github.com/docker/distribution/auth/silly"
+	"github.com/docker/distribution/configuration"
 )
 
 // TestAppDispatcher builds an application with a test dispatcher and ensures

auth/silly/access.go

@@ -12,7 +12,7 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/docker/docker-registry/auth"
+	"github.com/docker/distribution/auth"
 )
 
 // accessController provides a simple implementation of auth.AccessController

auth/silly/access_test.go

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

auth/token/accesscontroller.go

@@ -13,8 +13,8 @@ import (
 
 	"github.com/docker/libtrust"
 
-	"github.com/docker/docker-registry/auth"
-	"github.com/docker/docker-registry/common"
+	"github.com/docker/distribution/auth"
+	"github.com/docker/distribution/common"
 )
 
 // accessSet maps a typed, named resource to

auth/token/token.go

@@ -13,8 +13,8 @@ import (
 	log "github.com/Sirupsen/logrus"
 	"github.com/docker/libtrust"
 
-	"github.com/docker/docker-registry/auth"
-	"github.com/docker/docker-registry/common"
+	"github.com/docker/distribution/auth"
+	"github.com/docker/distribution/common"
 )
 
 const (

auth/token/token_test.go

@@ -17,8 +17,8 @@ import (
 
 	"github.com/docker/libtrust"
 
-	"github.com/docker/docker-registry/auth"
-	"github.com/docker/docker-registry/common"
+	"github.com/docker/distribution/auth"
+	"github.com/docker/distribution/common"
 )
 
 func makeRootKeys(numKeys int) ([]libtrust.PrivateKey, error) {

auth/token/util.go

@@ -5,7 +5,7 @@ import (
 	"errors"
 	"strings"
 
-	"github.com/docker/docker-registry/common"
+	"github.com/docker/distribution/common"
 )
 
 // joseBase64UrlEncode encodes the given data using the standard base64 url

client/client.go

@@ -10,9 +10,9 @@ import (
 	"regexp"
 	"strconv"
 
-	"github.com/docker/docker-registry/api/v2"
-	"github.com/docker/docker-registry/digest"
-	"github.com/docker/docker-registry/storage"
+	"github.com/docker/distribution/api/v2"
+	"github.com/docker/distribution/digest"
+	"github.com/docker/distribution/storage"
 )
 
 // Client implements the client interface to the registry http api

client/client_test.go

@@ -9,9 +9,9 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/docker/docker-registry/common/testutil"
-	"github.com/docker/docker-registry/digest"
-	"github.com/docker/docker-registry/storage"
+	"github.com/docker/distribution/common/testutil"
+	"github.com/docker/distribution/digest"
+	"github.com/docker/distribution/storage"
 )
 
 type testBlob struct {

client/errors.go

@@ -3,7 +3,7 @@ package client
 import (
 	"fmt"
 
-	"github.com/docker/docker-registry/digest"
+	"github.com/docker/distribution/digest"
 )
 
 // RepositoryNotFoundError is returned when making an operation against a

client/objectstore.go

@@ -6,8 +6,8 @@ import (
 	"io"
 	"sync"
 
-	"github.com/docker/docker-registry/digest"
-	"github.com/docker/docker-registry/storage"
+	"github.com/docker/distribution/digest"
+	"github.com/docker/distribution/storage"
 )
 
 var (

client/pull.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/docker/docker-registry/storage"
+	"github.com/docker/distribution/storage"
 
 	log "github.com/Sirupsen/logrus"
 )

client/push.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	log "github.com/Sirupsen/logrus"
-	"github.com/docker/docker-registry/storage"
+	"github.com/docker/distribution/storage"
 )
 
 // simultaneousLayerPushWindow is the size of the parallel layer push window.

cmd/registry-api-descriptor-template/main.go

@@ -20,7 +20,7 @@ import (
 	"regexp"
 	"text/template"
 
-	"github.com/docker/docker-registry/api/v2"
+	"github.com/docker/distribution/api/v2"
 )
 
 var spaceRegex = regexp.MustCompile(`\n\s*`)

cmd/registry-storagedriver-azure/main.go

@@ -7,8 +7,8 @@ import (
 	"os"
 
 	log "github.com/Sirupsen/logrus"
-	"github.com/docker/docker-registry/storagedriver/azure"
-	"github.com/docker/docker-registry/storagedriver/ipc"
+	"github.com/docker/distribution/storagedriver/azure"
+	"github.com/docker/distribution/storagedriver/ipc"
 )
 
 // An out-of-process Azure Storage driver, intended to be run by ipc.NewDriverClient

cmd/registry-storagedriver-filesystem/main.go

@@ -8,8 +8,8 @@ import (
 
 	"github.com/Sirupsen/logrus"
 
-	"github.com/docker/docker-registry/storagedriver/filesystem"
-	"github.com/docker/docker-registry/storagedriver/ipc"
+	"github.com/docker/distribution/storagedriver/filesystem"
+	"github.com/docker/distribution/storagedriver/ipc"
 )
 
 // An out-of-process filesystem driver, intended to be run by ipc.NewDriverClient

cmd/registry-storagedriver-inmemory/main.go

@@ -4,8 +4,8 @@ package main
 
 import (
 	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker-registry/storagedriver/inmemory"
-	"github.com/docker/docker-registry/storagedriver/ipc"
+	"github.com/docker/distribution/storagedriver/inmemory"
+	"github.com/docker/distribution/storagedriver/ipc"
 )
 
 // An out-of-process inmemory driver, intended to be run by ipc.NewDriverClient

cmd/registry-storagedriver-s3/main.go

@@ -8,8 +8,8 @@ import (
 
 	"github.com/Sirupsen/logrus"
 
-	"github.com/docker/docker-registry/storagedriver/ipc"
-	"github.com/docker/docker-registry/storagedriver/s3"
+	"github.com/docker/distribution/storagedriver/ipc"
+	"github.com/docker/distribution/storagedriver/s3"
 )
 
 // An out-of-process S3 driver, intended to be run by ipc.NewDriverClient

cmd/registry/main.go

@@ -12,12 +12,12 @@ import (
 	"github.com/gorilla/handlers"
 	"github.com/yvasiyarov/gorelic"
 
-	"github.com/docker/docker-registry"
-	_ "github.com/docker/docker-registry/auth/silly"
-	_ "github.com/docker/docker-registry/auth/token"
-	"github.com/docker/docker-registry/configuration"
-	_ "github.com/docker/docker-registry/storagedriver/filesystem"
-	_ "github.com/docker/docker-registry/storagedriver/inmemory"
+	"github.com/docker/distribution"
+	_ "github.com/docker/distribution/auth/silly"
+	_ "github.com/docker/distribution/auth/token"
+	"github.com/docker/distribution/configuration"
+	_ "github.com/docker/distribution/storagedriver/filesystem"
+	_ "github.com/docker/distribution/storagedriver/inmemory"
 )
 
 func main() {

context.go

@@ -2,7 +2,7 @@ package registry
 
 import (
 	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker-registry/api/v2"
+	"github.com/docker/distribution/api/v2"
 )
 
 // Context should contain the request specific context for use in across

digest/digest.go

@@ -10,7 +10,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/docker/docker-registry/common"
+	"github.com/docker/distribution/common"
 	"github.com/docker/docker/pkg/tarsum"
 )
 

digest/verifiers_test.go

@@ -7,7 +7,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/docker/docker-registry/common/testutil"
+	"github.com/docker/distribution/common/testutil"
 )
 
 func TestDigestVerifier(t *testing.T) {

images.go

@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/docker/docker-registry/api/v2"
-	"github.com/docker/docker-registry/digest"
-	"github.com/docker/docker-registry/storage"
+	"github.com/docker/distribution/api/v2"
+	"github.com/docker/distribution/digest"
+	"github.com/docker/distribution/storage"
 	"github.com/gorilla/handlers"
 )
 

layer.go

@@ -3,9 +3,9 @@ package registry
 import (
 	"net/http"
 
-	"github.com/docker/docker-registry/api/v2"
-	"github.com/docker/docker-registry/digest"
-	"github.com/docker/docker-registry/storage"
+	"github.com/docker/distribution/api/v2"
+	"github.com/docker/distribution/digest"
+	"github.com/docker/distribution/storage"
 	"github.com/gorilla/handlers"
 )
 

layerupload.go

@@ -7,9 +7,9 @@ import (
 	"strconv"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker-registry/api/v2"
-	"github.com/docker/docker-registry/digest"
-	"github.com/docker/docker-registry/storage"
+	"github.com/docker/distribution/api/v2"
+	"github.com/docker/distribution/digest"
+	"github.com/docker/distribution/storage"
 	"github.com/gorilla/handlers"
 )
 

storage/filereader.go

@@ -7,7 +7,7 @@ import (
 	"os"
 	"time"
 
-	"github.com/docker/docker-registry/storagedriver"
+	"github.com/docker/distribution/storagedriver"
 )
 
 // remoteFileReader provides a read seeker interface to files stored in

storage/filereader_test.go

@@ -8,9 +8,9 @@ import (
 	"os"
 	"testing"
 
-	"github.com/docker/docker-registry/digest"
+	"github.com/docker/distribution/digest"
 
-	"github.com/docker/docker-registry/storagedriver/inmemory"
+	"github.com/docker/distribution/storagedriver/inmemory"
 )
 
 func TestSimpleRead(t *testing.T) {

storage/layer.go

@@ -5,7 +5,7 @@ import (
 	"io"
 	"time"
 
-	"github.com/docker/docker-registry/digest"
+	"github.com/docker/distribution/digest"
 )
 
 // Layer provides a readable and seekable layer object. Typically,

storage/layer_test.go

@@ -9,10 +9,10 @@ import (
 	"os"
 	"testing"
 
-	"github.com/docker/docker-registry/common/testutil"
-	"github.com/docker/docker-registry/digest"
-	"github.com/docker/docker-registry/storagedriver"
-	"github.com/docker/docker-registry/storagedriver/inmemory"
+	"github.com/docker/distribution/common/testutil"
+	"github.com/docker/distribution/digest"
+	"github.com/docker/distribution/storagedriver"
+	"github.com/docker/distribution/storagedriver/inmemory"
 )
 
 // TestSimpleLayerUpload covers the layer upload process, exercising common

storage/layerreader.go

@@ -3,7 +3,7 @@ package storage
 import (
 	"time"
 
-	"github.com/docker/docker-registry/digest"
+	"github.com/docker/distribution/digest"
 )
 
 // layerReadSeeker implements Layer and provides facilities for reading and

storage/layerstore.go

@@ -1,8 +1,8 @@
 package storage
 
 import (
-	"github.com/docker/docker-registry/digest"
-	"github.com/docker/docker-registry/storagedriver"
+	"github.com/docker/distribution/digest"
+	"github.com/docker/distribution/storagedriver"
 )
 
 type layerStore struct {

storage/layerupload.go

@@ -9,8 +9,8 @@ import (
 
 	"code.google.com/p/go-uuid/uuid"
 
-	"github.com/docker/docker-registry/digest"
-	"github.com/docker/docker-registry/storagedriver"
+	"github.com/docker/distribution/digest"
+	"github.com/docker/distribution/storagedriver"
 	"github.com/docker/docker/pkg/tarsum"
 
 	"io"

storage/manifest.go

@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker-registry/digest"
+	"github.com/docker/distribution/digest"
 	"github.com/docker/libtrust"
 )
 

storage/manifest_test.go

@@ -6,8 +6,8 @@ import (
 
 	"github.com/docker/libtrust"
 
-	"github.com/docker/docker-registry/digest"
-	"github.com/docker/docker-registry/storagedriver/inmemory"
+	"github.com/docker/distribution/digest"
+	"github.com/docker/distribution/storagedriver/inmemory"
 )
 
 func TestManifestStorage(t *testing.T) {

storage/manifeststore.go

@@ -6,7 +6,7 @@ import (
 	"path"
 	"strings"
 
-	"github.com/docker/docker-registry/storagedriver"
+	"github.com/docker/distribution/storagedriver"
 	"github.com/docker/libtrust"
 )
 

storage/paths.go

@@ -5,8 +5,8 @@ import (
 	"path"
 	"strings"
 
-	"github.com/docker/docker-registry/common"
-	"github.com/docker/docker-registry/digest"
+	"github.com/docker/distribution/common"
+	"github.com/docker/distribution/digest"
 )
 
 const storagePathVersion = "v2"

storage/paths_test.go

@@ -3,7 +3,7 @@ package storage
 import (
 	"testing"
 
-	"github.com/docker/docker-registry/digest"
+	"github.com/docker/distribution/digest"
 )
 
 func TestPathMapper(t *testing.T) {

storage/services.go

@@ -1,8 +1,8 @@
 package storage
 
 import (
-	"github.com/docker/docker-registry/digest"
-	"github.com/docker/docker-registry/storagedriver"
+	"github.com/docker/distribution/digest"
+	"github.com/docker/distribution/storagedriver"
 )
 
 // Services provides various services with application-level operations for

storagedriver/azure/azure.go

@@ -13,8 +13,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/docker/docker-registry/storagedriver"
-	"github.com/docker/docker-registry/storagedriver/factory"
+	"github.com/docker/distribution/storagedriver"
+	"github.com/docker/distribution/storagedriver/factory"
 
 	azure "github.com/MSOpenTech/azure-sdk-for-go/clients/storage"
 )

storagedriver/azure/azure_test.go

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

storagedriver/factory/factory.go

@@ -3,7 +3,7 @@ package factory
 import (
 	"fmt"
 
-	"github.com/docker/docker-registry/storagedriver"
+	"github.com/docker/distribution/storagedriver"
 )
 
 // driverFactories stores an internal mapping between storage driver names and their respective

storagedriver/filesystem/driver.go

@@ -9,8 +9,8 @@ import (
 	"path"
 	"time"
 
-	"github.com/docker/docker-registry/storagedriver"
-	"github.com/docker/docker-registry/storagedriver/factory"
+	"github.com/docker/distribution/storagedriver"
+	"github.com/docker/distribution/storagedriver/factory"
 )
 
 const driverName = "filesystem"

storagedriver/filesystem/driver_test.go

@@ -5,8 +5,8 @@ import (
 	"os"
 	"testing"
 
-	"github.com/docker/docker-registry/storagedriver"
-	"github.com/docker/docker-registry/storagedriver/testsuites"
+	"github.com/docker/distribution/storagedriver"
+	"github.com/docker/distribution/storagedriver/testsuites"
 	. "gopkg.in/check.v1"
 )
 

storagedriver/inmemory/driver.go

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

storagedriver/inmemory/driver_test.go

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

storagedriver/ipc/client.go

@@ -13,7 +13,7 @@ import (
 	"os/exec"
 	"syscall"
 
-	"github.com/docker/docker-registry/storagedriver"
+	"github.com/docker/distribution/storagedriver"
 	"github.com/docker/libchan"
 	"github.com/docker/libchan/spdy"
 )

storagedriver/ipc/ipc.go

@@ -7,7 +7,7 @@ import (
 	"io"
 	"reflect"
 
-	"github.com/docker/docker-registry/storagedriver"
+	"github.com/docker/distribution/storagedriver"
 	"github.com/docker/libchan"
 )
 

storagedriver/ipc/server.go

@@ -10,7 +10,7 @@ import (
 	"os"
 	"reflect"
 
-	"github.com/docker/docker-registry/storagedriver"
+	"github.com/docker/distribution/storagedriver"
 	"github.com/docker/libchan"
 	"github.com/docker/libchan/spdy"
 )

storagedriver/s3/s3.go

@@ -26,8 +26,8 @@ import (
 
 	"github.com/crowdmob/goamz/aws"
 	"github.com/crowdmob/goamz/s3"
-	"github.com/docker/docker-registry/storagedriver"
-	"github.com/docker/docker-registry/storagedriver/factory"
+	"github.com/docker/distribution/storagedriver"
+	"github.com/docker/distribution/storagedriver/factory"
 )
 
 const driverName = "s3"

storagedriver/s3/s3_test.go

@@ -7,8 +7,8 @@ import (
 	"testing"
 
 	"github.com/crowdmob/goamz/aws"
-	"github.com/docker/docker-registry/storagedriver"
-	"github.com/docker/docker-registry/storagedriver/testsuites"
+	"github.com/docker/distribution/storagedriver"
+	"github.com/docker/distribution/storagedriver/testsuites"
 
 	"gopkg.in/check.v1"
 )

storagedriver/testsuites/testsuites.go

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

tags.go

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