Merge pull request #36194 from dnephin/add-canonical-import

Add canonical import path
Upstream-commit: 3a633a712c8bbb863fe7e57ec132dd87a9c4eff7
Component: engine

components/engine/api/common.go

@@ -1,4 +1,4 @@
-package api
+package api // import "github.com/docker/docker/api"
 
 // Common constants for daemon and client.
 const (

components/engine/api/common_unix.go

@@ -1,6 +1,6 @@
 // +build !windows
 
-package api
+package api // import "github.com/docker/docker/api"
 
 // MinVersion represents Minimum REST API version supported
 const MinVersion string = "1.12"

components/engine/api/common_windows.go

@@ -1,4 +1,4 @@
-package api
+package api // import "github.com/docker/docker/api"
 
 // MinVersion represents Minimum REST API version supported
 // Technically the first daemon API version released on Windows is v1.25 in

components/engine/api/server/backend/build/backend.go

@@ -1,4 +1,4 @@
-package build
+package build // import "github.com/docker/docker/api/server/backend/build"
 
 import (
 	"fmt"

components/engine/api/server/backend/build/tag.go

@@ -1,4 +1,4 @@
-package build
+package build // import "github.com/docker/docker/api/server/backend/build"
 
 import (
 	"fmt"

components/engine/api/server/httputils/decoder.go

@@ -1,4 +1,4 @@
-package httputils
+package httputils // import "github.com/docker/docker/api/server/httputils"
 
 import (
 	"io"

components/engine/api/server/httputils/errors.go

@@ -1,4 +1,4 @@
-package httputils
+package httputils // import "github.com/docker/docker/api/server/httputils"
 
 import (
 	"fmt"

components/engine/api/server/httputils/form.go

@@ -1,4 +1,4 @@
-package httputils
+package httputils // import "github.com/docker/docker/api/server/httputils"
 
 import (
 	"net/http"

components/engine/api/server/httputils/form_test.go

@@ -1,4 +1,4 @@
-package httputils
+package httputils // import "github.com/docker/docker/api/server/httputils"
 
 import (
 	"net/http"

components/engine/api/server/httputils/httputils.go

@@ -1,4 +1,4 @@
-package httputils
+package httputils // import "github.com/docker/docker/api/server/httputils"
 
 import (
 	"io"

components/engine/api/server/httputils/httputils_test.go

@@ -1,4 +1,4 @@
-package httputils
+package httputils // import "github.com/docker/docker/api/server/httputils"
 
 import "testing"
 

components/engine/api/server/httputils/httputils_write_json.go

@@ -1,4 +1,4 @@
-package httputils
+package httputils // import "github.com/docker/docker/api/server/httputils"
 
 import (
 	"encoding/json"

components/engine/api/server/httputils/write_log_stream.go

@@ -1,4 +1,4 @@
-package httputils
+package httputils // import "github.com/docker/docker/api/server/httputils"
 
 import (
 	"fmt"

components/engine/api/server/middleware.go

@@ -1,4 +1,4 @@
-package server
+package server // import "github.com/docker/docker/api/server"
 
 import (
 	"github.com/docker/docker/api/server/httputils"

components/engine/api/server/middleware/cors.go

@@ -1,4 +1,4 @@
-package middleware
+package middleware // import "github.com/docker/docker/api/server/middleware"
 
 import (
 	"net/http"

components/engine/api/server/middleware/debug.go

@@ -1,4 +1,4 @@
-package middleware
+package middleware // import "github.com/docker/docker/api/server/middleware"
 
 import (
 	"bufio"

components/engine/api/server/middleware/debug_test.go

@@ -1,4 +1,4 @@
-package middleware
+package middleware // import "github.com/docker/docker/api/server/middleware"
 
 import (
 	"testing"

components/engine/api/server/middleware/experimental.go

@@ -1,4 +1,4 @@
-package middleware
+package middleware // import "github.com/docker/docker/api/server/middleware"
 
 import (
 	"net/http"

components/engine/api/server/middleware/middleware.go

@@ -1,4 +1,4 @@
-package middleware
+package middleware // import "github.com/docker/docker/api/server/middleware"
 
 import (
 	"net/http"

components/engine/api/server/middleware/version.go

@@ -1,4 +1,4 @@
-package middleware
+package middleware // import "github.com/docker/docker/api/server/middleware"
 
 import (
 	"fmt"

components/engine/api/server/middleware/version_test.go

@@ -1,4 +1,4 @@
-package middleware
+package middleware // import "github.com/docker/docker/api/server/middleware"
 
 import (
 	"net/http"

components/engine/api/server/router/build/backend.go

@@ -1,4 +1,4 @@
-package build
+package build // import "github.com/docker/docker/api/server/router/build"
 
 import (
 	"github.com/docker/docker/api/types"

components/engine/api/server/router/build/build.go

@@ -1,4 +1,4 @@
-package build
+package build // import "github.com/docker/docker/api/server/router/build"
 
 import "github.com/docker/docker/api/server/router"
 

components/engine/api/server/router/build/build_routes.go

@@ -1,4 +1,4 @@
-package build
+package build // import "github.com/docker/docker/api/server/router/build"
 
 import (
 	"bytes"

components/engine/api/server/router/checkpoint/backend.go

@@ -1,4 +1,4 @@
-package checkpoint
+package checkpoint // import "github.com/docker/docker/api/server/router/checkpoint"
 
 import "github.com/docker/docker/api/types"
 

components/engine/api/server/router/checkpoint/checkpoint.go

@@ -1,4 +1,4 @@
-package checkpoint
+package checkpoint // import "github.com/docker/docker/api/server/router/checkpoint"
 
 import (
 	"github.com/docker/docker/api/server/httputils"

components/engine/api/server/router/checkpoint/checkpoint_routes.go

@@ -1,4 +1,4 @@
-package checkpoint
+package checkpoint // import "github.com/docker/docker/api/server/router/checkpoint"
 
 import (
 	"encoding/json"

components/engine/api/server/router/container/backend.go

@@ -1,4 +1,4 @@
-package container
+package container // import "github.com/docker/docker/api/server/router/container"
 
 import (
 	"io"

components/engine/api/server/router/container/container.go

@@ -1,4 +1,4 @@
-package container
+package container // import "github.com/docker/docker/api/server/router/container"
 
 import (
 	"github.com/docker/docker/api/server/httputils"

components/engine/api/server/router/container/container_routes.go

@@ -1,4 +1,4 @@
-package container
+package container // import "github.com/docker/docker/api/server/router/container"
 
 import (
 	"encoding/json"

components/engine/api/server/router/container/copy.go

@@ -1,4 +1,4 @@
-package container
+package container // import "github.com/docker/docker/api/server/router/container"
 
 import (
 	"encoding/base64"

components/engine/api/server/router/container/exec.go

@@ -1,4 +1,4 @@
-package container
+package container // import "github.com/docker/docker/api/server/router/container"
 
 import (
 	"encoding/json"

components/engine/api/server/router/container/inspect.go

@@ -1,4 +1,4 @@
-package container
+package container // import "github.com/docker/docker/api/server/router/container"
 
 import (
 	"net/http"

components/engine/api/server/router/debug/debug.go

@@ -1,4 +1,4 @@
-package debug
+package debug // import "github.com/docker/docker/api/server/router/debug"
 
 import (
 	"expvar"

components/engine/api/server/router/debug/debug_routes.go

@@ -1,4 +1,4 @@
-package debug
+package debug // import "github.com/docker/docker/api/server/router/debug"
 
 import (
 	"net/http"

components/engine/api/server/router/distribution/backend.go

@@ -1,4 +1,4 @@
-package distribution
+package distribution // import "github.com/docker/docker/api/server/router/distribution"
 
 import (
 	"github.com/docker/distribution"

components/engine/api/server/router/distribution/distribution.go

@@ -1,4 +1,4 @@
-package distribution
+package distribution // import "github.com/docker/docker/api/server/router/distribution"
 
 import "github.com/docker/docker/api/server/router"
 

components/engine/api/server/router/distribution/distribution_routes.go

@@ -1,4 +1,4 @@
-package distribution
+package distribution // import "github.com/docker/docker/api/server/router/distribution"
 
 import (
 	"encoding/base64"

components/engine/api/server/router/experimental.go

@@ -1,4 +1,4 @@
-package router
+package router // import "github.com/docker/docker/api/server/router"
 
 import (
 	"net/http"

components/engine/api/server/router/image/backend.go

@@ -1,4 +1,4 @@
-package image
+package image // import "github.com/docker/docker/api/server/router/image"
 
 import (
 	"io"

components/engine/api/server/router/image/image.go

@@ -1,4 +1,4 @@
-package image
+package image // import "github.com/docker/docker/api/server/router/image"
 
 import (
 	"github.com/docker/docker/api/server/httputils"

components/engine/api/server/router/image/image_routes.go

@@ -1,4 +1,4 @@
-package image
+package image // import "github.com/docker/docker/api/server/router/image"
 
 import (
 	"encoding/base64"

components/engine/api/server/router/local.go

@@ -1,4 +1,4 @@
-package router
+package router // import "github.com/docker/docker/api/server/router"
 
 import (
 	"net/http"

components/engine/api/server/router/network/backend.go

@@ -1,4 +1,4 @@
-package network
+package network // import "github.com/docker/docker/api/server/router/network"
 
 import (
 	"golang.org/x/net/context"

components/engine/api/server/router/network/filter.go

@@ -1,4 +1,4 @@
-package network
+package network // import "github.com/docker/docker/api/server/router/network"
 
 import (
 	"github.com/docker/docker/api/types"

components/engine/api/server/router/network/filter_test.go

@@ -1,6 +1,6 @@
 // +build !windows
 
-package network
+package network // import "github.com/docker/docker/api/server/router/network"
 
 import (
 	"strings"

components/engine/api/server/router/network/network.go

@@ -1,4 +1,4 @@
-package network
+package network // import "github.com/docker/docker/api/server/router/network"
 
 import (
 	"github.com/docker/docker/api/server/router"

components/engine/api/server/router/network/network_routes.go

@@ -1,4 +1,4 @@
-package network
+package network // import "github.com/docker/docker/api/server/router/network"
 
 import (
 	"encoding/json"

components/engine/api/server/router/plugin/backend.go

@@ -1,4 +1,4 @@
-package plugin
+package plugin // import "github.com/docker/docker/api/server/router/plugin"
 
 import (
 	"io"

components/engine/api/server/router/plugin/plugin.go

@@ -1,4 +1,4 @@
-package plugin
+package plugin // import "github.com/docker/docker/api/server/router/plugin"
 
 import "github.com/docker/docker/api/server/router"
 

components/engine/api/server/router/plugin/plugin_routes.go

@@ -1,4 +1,4 @@
-package plugin
+package plugin // import "github.com/docker/docker/api/server/router/plugin"
 
 import (
 	"encoding/base64"

components/engine/api/server/router/router.go

@@ -1,4 +1,4 @@
-package router
+package router // import "github.com/docker/docker/api/server/router"
 
 import "github.com/docker/docker/api/server/httputils"
 

components/engine/api/server/router/session/backend.go

@@ -1,4 +1,4 @@
-package session
+package session // import "github.com/docker/docker/api/server/router/session"
 
 import (
 	"net/http"

components/engine/api/server/router/session/session.go

@@ -1,4 +1,4 @@
-package session
+package session // import "github.com/docker/docker/api/server/router/session"
 
 import "github.com/docker/docker/api/server/router"
 

components/engine/api/server/router/session/session_routes.go

@@ -1,4 +1,4 @@
-package session
+package session // import "github.com/docker/docker/api/server/router/session"
 
 import (
 	"net/http"

components/engine/api/server/router/swarm/backend.go

@@ -1,4 +1,4 @@
-package swarm
+package swarm // import "github.com/docker/docker/api/server/router/swarm"
 
 import (
 	basictypes "github.com/docker/docker/api/types"

components/engine/api/server/router/swarm/cluster.go

@@ -1,4 +1,4 @@
-package swarm
+package swarm // import "github.com/docker/docker/api/server/router/swarm"
 
 import "github.com/docker/docker/api/server/router"
 

components/engine/api/server/router/swarm/cluster_routes.go

@@ -1,4 +1,4 @@
-package swarm
+package swarm // import "github.com/docker/docker/api/server/router/swarm"
 
 import (
 	"encoding/json"

components/engine/api/server/router/swarm/helpers.go

@@ -1,4 +1,4 @@
-package swarm
+package swarm // import "github.com/docker/docker/api/server/router/swarm"
 
 import (
 	"fmt"

components/engine/api/server/router/system/backend.go

@@ -1,4 +1,4 @@
-package system
+package system // import "github.com/docker/docker/api/server/router/system"
 
 import (
 	"time"

components/engine/api/server/router/system/system.go

@@ -1,4 +1,4 @@
-package system
+package system // import "github.com/docker/docker/api/server/router/system"
 
 import (
 	"github.com/docker/docker/api/server/router"

components/engine/api/server/router/system/system_routes.go

@@ -1,4 +1,4 @@
-package system
+package system // import "github.com/docker/docker/api/server/router/system"
 
 import (
 	"encoding/json"

components/engine/api/server/router/volume/backend.go

@@ -1,4 +1,4 @@
-package volume
+package volume // import "github.com/docker/docker/api/server/router/volume"
 
 import (
 	"golang.org/x/net/context"

components/engine/api/server/router/volume/volume.go

@@ -1,4 +1,4 @@
-package volume
+package volume // import "github.com/docker/docker/api/server/router/volume"
 
 import "github.com/docker/docker/api/server/router"
 

components/engine/api/server/router/volume/volume_routes.go

@@ -1,4 +1,4 @@
-package volume
+package volume // import "github.com/docker/docker/api/server/router/volume"
 
 import (
 	"encoding/json"

components/engine/api/server/router_swapper.go

@@ -1,4 +1,4 @@
-package server
+package server // import "github.com/docker/docker/api/server"
 
 import (
 	"net/http"

components/engine/api/server/server.go

@@ -1,4 +1,4 @@
-package server
+package server // import "github.com/docker/docker/api/server"
 
 import (
 	"crypto/tls"

components/engine/api/server/server_test.go

@@ -1,4 +1,4 @@
-package server
+package server // import "github.com/docker/docker/api/server"
 
 import (
 	"net/http"

components/engine/api/types/auth.go

@@ -1,4 +1,4 @@
-package types
+package types // import "github.com/docker/docker/api/types"
 
 // AuthConfig contains authorization information for connecting to a Registry
 type AuthConfig struct {

components/engine/api/types/backend/backend.go

@@ -1,5 +1,5 @@
 // Package backend includes types to send information to server backends.
-package backend
+package backend // import "github.com/docker/docker/api/types/backend"
 
 import (
 	"io"

components/engine/api/types/backend/build.go

@@ -1,4 +1,4 @@
-package backend
+package backend // import "github.com/docker/docker/api/types/backend"
 
 import (
 	"io"

components/engine/api/types/blkiodev/blkio.go

@@ -1,4 +1,4 @@
-package blkiodev
+package blkiodev // import "github.com/docker/docker/api/types/blkiodev"
 
 import "fmt"
 

components/engine/api/types/client.go

@@ -1,4 +1,4 @@
-package types
+package types // import "github.com/docker/docker/api/types"
 
 import (
 	"bufio"

components/engine/api/types/configs.go

@@ -1,4 +1,4 @@
-package types
+package types // import "github.com/docker/docker/api/types"
 
 import (
 	"github.com/docker/docker/api/types/container"

components/engine/api/types/container/config.go

@@ -1,4 +1,4 @@
-package container
+package container // import "github.com/docker/docker/api/types/container"
 
 import (
 	"time"

components/engine/api/types/container/host_config.go

@@ -1,4 +1,4 @@
-package container
+package container // import "github.com/docker/docker/api/types/container"
 
 import (
 	"strings"

components/engine/api/types/container/hostconfig_unix.go

@@ -1,6 +1,6 @@
 // +build !windows
 
-package container
+package container // import "github.com/docker/docker/api/types/container"
 
 // IsValid indicates if an isolation technology is valid
 func (i Isolation) IsValid() bool {

components/engine/api/types/container/hostconfig_windows.go

@@ -1,4 +1,4 @@
-package container
+package container // import "github.com/docker/docker/api/types/container"
 
 // IsBridge indicates whether container uses the bridge network stack
 // in windows it is given the name NAT

components/engine/api/types/container/waitcondition.go

@@ -1,4 +1,4 @@
-package container
+package container // import "github.com/docker/docker/api/types/container"
 
 // WaitCondition is a type used to specify a container state for which
 // to wait.

components/engine/api/types/events/events.go

@@ -1,4 +1,4 @@
-package events
+package events // import "github.com/docker/docker/api/types/events"
 
 const (
 	// ContainerEventType is the event type that containers generate

components/engine/api/types/filters/example_test.go

@@ -1,4 +1,4 @@
-package filters
+package filters // import "github.com/docker/docker/api/types/filters"
 
 func ExampleArgs_MatchKVList() {
 	args := NewArgs(

components/engine/api/types/filters/parse.go

@@ -1,7 +1,7 @@
 /*Package filters provides tools for encoding a mapping of keys to a set of
 multiple values.
 */
-package filters
+package filters // import "github.com/docker/docker/api/types/filters"
 
 import (
 	"encoding/json"

components/engine/api/types/filters/parse_test.go

@@ -1,4 +1,4 @@
-package filters
+package filters // import "github.com/docker/docker/api/types/filters"
 
 import (
 	"errors"

components/engine/api/types/mount/mount.go

@@ -1,4 +1,4 @@
-package mount
+package mount // import "github.com/docker/docker/api/types/mount"
 
 import (
 	"os"

components/engine/api/types/network/network.go

@@ -1,4 +1,4 @@
-package network
+package network // import "github.com/docker/docker/api/types/network"
 
 // Address represents an IP address
 type Address struct {

components/engine/api/types/plugin_responses.go

@@ -1,4 +1,4 @@
-package types
+package types // import "github.com/docker/docker/api/types"
 
 import (
 	"encoding/json"

components/engine/api/types/plugins/logdriver/gen.go

@@ -1,3 +1,3 @@
 //go:generate protoc --gogofast_out=import_path=github.com/docker/docker/api/types/plugins/logdriver:. entry.proto
 
-package logdriver
+package logdriver // import "github.com/docker/docker/api/types/plugins/logdriver"

components/engine/api/types/plugins/logdriver/io.go

@@ -1,4 +1,4 @@
-package logdriver
+package logdriver // import "github.com/docker/docker/api/types/plugins/logdriver"
 
 import (
 	"encoding/binary"

components/engine/api/types/registry/authenticate.go

@@ -1,4 +1,4 @@
-package registry
+package registry // import "github.com/docker/docker/api/types/registry"
 
 // ----------------------------------------------------------------------------
 // DO NOT EDIT THIS FILE

components/engine/api/types/registry/registry.go

@@ -1,4 +1,4 @@
-package registry
+package registry // import "github.com/docker/docker/api/types/registry"
 
 import (
 	"encoding/json"

components/engine/api/types/seccomp.go

@@ -1,4 +1,4 @@
-package types
+package types // import "github.com/docker/docker/api/types"
 
 // Seccomp represents the config for a seccomp profile for syscall restriction.
 type Seccomp struct {

components/engine/api/types/stats.go

@@ -1,6 +1,6 @@
 // Package types is used for API stability in the types and response to the
 // consumers of the API stats endpoint.
-package types
+package types // import "github.com/docker/docker/api/types"
 
 import "time"
 

components/engine/api/types/strslice/strslice.go

@@ -1,4 +1,4 @@
-package strslice
+package strslice // import "github.com/docker/docker/api/types/strslice"
 
 import "encoding/json"
 

components/engine/api/types/strslice/strslice_test.go

@@ -1,4 +1,4 @@
-package strslice
+package strslice // import "github.com/docker/docker/api/types/strslice"
 
 import (
 	"encoding/json"

components/engine/api/types/swarm/common.go

@@ -1,4 +1,4 @@
-package swarm
+package swarm // import "github.com/docker/docker/api/types/swarm"
 
 import "time"
 

components/engine/api/types/swarm/config.go

@@ -1,4 +1,4 @@
-package swarm
+package swarm // import "github.com/docker/docker/api/types/swarm"
 
 import "os"
 

components/engine/api/types/swarm/container.go

@@ -1,4 +1,4 @@
-package swarm
+package swarm // import "github.com/docker/docker/api/types/swarm"
 
 import (
 	"time"

components/engine/api/types/swarm/network.go

@@ -1,4 +1,4 @@
-package swarm
+package swarm // import "github.com/docker/docker/api/types/swarm"
 
 import (
 	"github.com/docker/docker/api/types/network"

components/engine/api/types/swarm/node.go

@@ -1,4 +1,4 @@
-package swarm
+package swarm // import "github.com/docker/docker/api/types/swarm"
 
 // Node represents a node.
 type Node struct {

components/engine/api/types/swarm/runtime.go

@@ -1,4 +1,4 @@
-package swarm
+package swarm // import "github.com/docker/docker/api/types/swarm"
 
 // RuntimeType is the type of runtime used for the TaskSpec
 type RuntimeType string