new file mode 100644

@@ -0,0 +1,47 @@

+package errors

+

+import "net/http"

+

+// apiError is an error wrapper that also

+// holds information about response status codes.

+type apiError struct {

+	error

+	statusCode int

+}

+

+// HTTPErrorStatusCode returns a status code.

+func (e apiError) HTTPErrorStatusCode() int {

+	return e.statusCode

+}

+

+// NewErrorWithStatusCode allows you to associate

+// a specific HTTP Status Code to an error.

+// The Server will take that code and set

+// it as the response status.

+func NewErrorWithStatusCode(err error, code int) error {

+	return apiError{err, code}

+}

+

+// NewBadRequestError creates a new API error

+// that has the 400 HTTP status code associated to it.

+func NewBadRequestError(err error) error {

+	return NewErrorWithStatusCode(err, http.StatusBadRequest)

+}

+

+// NewRequestForbiddenError creates a new API error

+// that has the 403 HTTP status code associated to it.

+func NewRequestForbiddenError(err error) error {

+	return NewErrorWithStatusCode(err, http.StatusForbidden)

+}

+

+// NewRequestNotFoundError creates a new API error

+// that has the 404 HTTP status code associated to it.

+func NewRequestNotFoundError(err error) error {

+	return NewErrorWithStatusCode(err, http.StatusNotFound)

+}

+

+// NewRequestConflictError creates a new API error

+// that has the 409 HTTP status code associated to it.

+func NewRequestConflictError(err error) error {

+	return NewErrorWithStatusCode(err, http.StatusConflict)

+}

@@ -8,13 +8,13 @@ import (

 	"github.com/Sirupsen/logrus"

 	"github.com/docker/docker/api"

+	"github.com/docker/docker/api/errors"

 	"github.com/docker/docker/api/server/httputils"

 	"github.com/docker/docker/api/types"

 	"github.com/docker/docker/api/types/events"

 	"github.com/docker/docker/api/types/filters"

 	timetypes "github.com/docker/docker/api/types/time"

 	"github.com/docker/docker/api/types/versions"

-	"github.com/docker/docker/errors"

 	"github.com/docker/docker/pkg/ioutils"

 	"golang.org/x/net/context"

 )

@@ -8,10 +8,10 @@ import (

 	"strings"

 	"github.com/Sirupsen/logrus"

+	"github.com/docker/docker/api/errors"

 	"github.com/docker/docker/api/server/httputils"

 	"github.com/docker/docker/api/server/middleware"

 	"github.com/docker/docker/api/server/router"

-	"github.com/docker/docker/errors"

 	"github.com/gorilla/mux"

 	"golang.org/x/net/context"

 )

@@ -6,10 +6,10 @@ import (

 	"time"

 	"github.com/Sirupsen/logrus"

+	"github.com/docker/docker/api/errors"

 	"github.com/docker/docker/api/types/backend"

 	"github.com/docker/docker/container"

 	"github.com/docker/docker/daemon/logger"

-	"github.com/docker/docker/errors"

 	"github.com/docker/docker/pkg/stdcopy"

 	"github.com/docker/docker/pkg/term"

 )

@@ -14,6 +14,7 @@ import (

 	"google.golang.org/grpc"

 	"github.com/Sirupsen/logrus"

+	"github.com/docker/docker/api/errors"

 	apitypes "github.com/docker/docker/api/types"

 	"github.com/docker/docker/api/types/filters"

 	"github.com/docker/docker/api/types/network"

@@ -21,7 +22,6 @@ import (

 	"github.com/docker/docker/daemon/cluster/convert"

 	executorpkg "github.com/docker/docker/daemon/cluster/executor"

 	"github.com/docker/docker/daemon/cluster/executor/container"

-	"github.com/docker/docker/errors"

 	"github.com/docker/docker/opts"

 	"github.com/docker/docker/pkg/ioutils"

 	"github.com/docker/docker/pkg/signal"

@@ -6,11 +6,11 @@ import (

 	"regexp"

 	"time"

+	"github.com/docker/docker/api/errors"

 	containertypes "github.com/docker/docker/api/types/container"

 	"github.com/docker/docker/api/types/strslice"

 	"github.com/docker/docker/container"

 	"github.com/docker/docker/daemon/network"

-	"github.com/docker/docker/errors"

 	"github.com/docker/docker/image"

 	"github.com/docker/docker/pkg/signal"

 	"github.com/docker/docker/pkg/system"

@@ -9,11 +9,11 @@ import (

 	"strings"

 	"github.com/Sirupsen/logrus"

+	derr "github.com/docker/docker/api/errors"

 	containertypes "github.com/docker/docker/api/types/container"

 	networktypes "github.com/docker/docker/api/types/network"

 	"github.com/docker/docker/container"

 	"github.com/docker/docker/daemon/network"

-	derr "github.com/docker/docker/errors"

 	"github.com/docker/docker/pkg/stringid"

 	"github.com/docker/docker/runconfig"

 	"github.com/docker/go-connections/nat"

@@ -6,11 +6,11 @@ import (

 	"strings"

 	"github.com/Sirupsen/logrus"

+	"github.com/docker/docker/api/errors"

 	"github.com/docker/docker/api/types"

 	containertypes "github.com/docker/docker/api/types/container"

 	networktypes "github.com/docker/docker/api/types/network"

 	"github.com/docker/docker/container"

-	"github.com/docker/docker/errors"

 	"github.com/docker/docker/image"

 	"github.com/docker/docker/layer"

 	"github.com/docker/docker/pkg/idtools"

@@ -7,9 +7,9 @@ import (

 	"strings"

 	"github.com/Sirupsen/logrus"

+	"github.com/docker/docker/api/errors"

 	"github.com/docker/docker/api/types"

 	"github.com/docker/docker/container"

-	"github.com/docker/docker/errors"

 	"github.com/docker/docker/layer"

 	volumestore "github.com/docker/docker/volume/store"

 )

@@ -4,7 +4,7 @@ import (

 	"fmt"

 	"strings"

-	"github.com/docker/docker/errors"

+	"github.com/docker/docker/api/errors"

 	"github.com/docker/docker/reference"

 )

@@ -9,11 +9,11 @@ import (

 	"golang.org/x/net/context"

 	"github.com/Sirupsen/logrus"

+	"github.com/docker/docker/api/errors"

 	"github.com/docker/docker/api/types"

 	"github.com/docker/docker/api/types/strslice"

 	"github.com/docker/docker/container"

 	"github.com/docker/docker/daemon/exec"

-	"github.com/docker/docker/errors"

 	"github.com/docker/docker/libcontainerd"

 	"github.com/docker/docker/pkg/pools"

 	"github.com/docker/docker/pkg/signal"

@@ -4,9 +4,9 @@ import (

 	"fmt"

 	"strings"

+	"github.com/docker/docker/api/errors"

 	"github.com/docker/docker/api/types"

 	"github.com/docker/docker/container"

-	"github.com/docker/docker/errors"

 	"github.com/docker/docker/image"

 	"github.com/docker/docker/pkg/stringid"

 	"github.com/docker/docker/reference"

@@ -7,10 +7,10 @@ import (

 	"strings"

 	"github.com/Sirupsen/logrus"

+	"github.com/docker/docker/api/errors"

 	"github.com/docker/docker/api/types"

 	"github.com/docker/docker/api/types/network"

 	clustertypes "github.com/docker/docker/daemon/cluster/provider"

-	"github.com/docker/docker/errors"

 	"github.com/docker/docker/runconfig"

 	"github.com/docker/libnetwork"

 	networktypes "github.com/docker/libnetwork/types"

@@ -10,10 +10,10 @@ import (

 	"google.golang.org/grpc"

 	"github.com/Sirupsen/logrus"

+	"github.com/docker/docker/api/errors"

 	"github.com/docker/docker/api/types"

 	containertypes "github.com/docker/docker/api/types/container"

 	"github.com/docker/docker/container"

-	"github.com/docker/docker/errors"

 	"github.com/docker/docker/libcontainerd"

 	"github.com/docker/docker/runconfig"

 )

@@ -6,8 +6,8 @@ import (

 	"time"

 	"github.com/Sirupsen/logrus"

+	"github.com/docker/docker/api/errors"

 	"github.com/docker/docker/container"

-	"github.com/docker/docker/errors"

 )

 // ContainerStop looks for the given container and terminates it,

@@ -7,11 +7,11 @@ import (

 	"path/filepath"

 	"strings"

+	dockererrors "github.com/docker/docker/api/errors"

 	"github.com/docker/docker/api/types"

 	containertypes "github.com/docker/docker/api/types/container"

 	mounttypes "github.com/docker/docker/api/types/mount"

 	"github.com/docker/docker/container"

-	dockererrors "github.com/docker/docker/errors"

 	"github.com/docker/docker/volume"

 	"github.com/opencontainers/runc/libcontainer/label"

 )

deleted file mode 100644

@@ -1,47 +0,0 @@

-package errors

-

-import "net/http"

-

-// apiError is an error wrapper that also

-// holds information about response status codes.

-type apiError struct {

-	error

-	statusCode int

-}

-

-// HTTPErrorStatusCode returns a status code.

-func (e apiError) HTTPErrorStatusCode() int {

-	return e.statusCode

-}

-

-// NewErrorWithStatusCode allows you to associate

-// a specific HTTP Status Code to an error.

-// The Server will take that code and set

-// it as the response status.

-func NewErrorWithStatusCode(err error, code int) error {

-	return apiError{err, code}

-}

-

-// NewBadRequestError creates a new API error

-// that has the 400 HTTP status code associated to it.

-func NewBadRequestError(err error) error {

-	return NewErrorWithStatusCode(err, http.StatusBadRequest)

-}

-

-// NewRequestForbiddenError creates a new API error

-// that has the 403 HTTP status code associated to it.

-func NewRequestForbiddenError(err error) error {

-	return NewErrorWithStatusCode(err, http.StatusForbidden)

-}

-

-// NewRequestNotFoundError creates a new API error

-// that has the 404 HTTP status code associated to it.

-func NewRequestNotFoundError(err error) error {

-	return NewErrorWithStatusCode(err, http.StatusNotFound)

-}

-

-// NewRequestConflictError creates a new API error

-// that has the 409 HTTP status code associated to it.

-func NewRequestConflictError(err error) error {

-	return NewErrorWithStatusCode(err, http.StatusConflict)

-}

@@ -3,7 +3,7 @@ package runconfig

 import (

 	"fmt"

-	"github.com/docker/docker/errors"

+	"github.com/docker/docker/api/errors"

 )

 var (