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

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

components/engine/daemon/apparmor_default.go

@@ -1,6 +1,6 @@
 // +build linux
 
-package daemon
+package daemon // import "github.com/docker/docker/daemon"
 
 import (
 	"fmt"

components/engine/daemon/apparmor_default_unsupported.go

@@ -1,6 +1,6 @@
 // +build !linux
 
-package daemon
+package daemon // import "github.com/docker/docker/daemon"
 
 func ensureDefaultAppArmorProfile() error {
 	return nil

components/engine/daemon/archive.go

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

components/engine/daemon/archive_tarcopyoptions.go

@@ -1,4 +1,4 @@
-package daemon
+package daemon // import "github.com/docker/docker/daemon"
 
 import (
 	"github.com/docker/docker/pkg/archive"

components/engine/daemon/archive_tarcopyoptions_unix.go

@@ -1,6 +1,6 @@
 // +build !windows
 
-package daemon
+package daemon // import "github.com/docker/docker/daemon"
 
 import (
 	"github.com/docker/docker/container"

components/engine/daemon/archive_tarcopyoptions_windows.go

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

components/engine/daemon/archive_unix.go

@@ -1,6 +1,6 @@
 // +build !windows
 
-package daemon
+package daemon // import "github.com/docker/docker/daemon"
 
 import (
 	"github.com/docker/docker/container"

components/engine/daemon/archive_windows.go

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

components/engine/daemon/attach.go

@@ -1,4 +1,4 @@
-package daemon
+package daemon // import "github.com/docker/docker/daemon"
 
 import (
 	"context"

components/engine/daemon/auth.go

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

components/engine/daemon/bindmount_unix.go

@@ -1,5 +1,5 @@
 // +build linux freebsd
 
-package daemon
+package daemon // import "github.com/docker/docker/daemon"
 
 const bindMountType = "bind"

components/engine/daemon/build.go

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

components/engine/daemon/cache.go

@@ -1,4 +1,4 @@
-package daemon
+package daemon // import "github.com/docker/docker/daemon"
 
 import (
 	"github.com/docker/docker/builder"

components/engine/daemon/caps/utils_unix.go

@@ -1,6 +1,6 @@
 // +build !windows
 
-package caps
+package caps // import "github.com/docker/docker/daemon/caps"
 
 import (
 	"fmt"

components/engine/daemon/changes.go

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

components/engine/daemon/checkpoint.go

@@ -1,4 +1,4 @@
-package daemon
+package daemon // import "github.com/docker/docker/daemon"
 
 import (
 	"context"

components/engine/daemon/cluster.go

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

components/engine/daemon/cluster/cluster.go

@@ -1,4 +1,4 @@
-package cluster
+package cluster // import "github.com/docker/docker/daemon/cluster"
 
 //
 // ## Swarmkit integration

components/engine/daemon/cluster/configs.go

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

components/engine/daemon/cluster/controllers/plugin/controller.go

@@ -1,4 +1,4 @@
-package plugin
+package plugin // import "github.com/docker/docker/daemon/cluster/controllers/plugin"
 
 import (
 	"io"

components/engine/daemon/cluster/controllers/plugin/controller_test.go

@@ -1,4 +1,4 @@
-package plugin
+package plugin // import "github.com/docker/docker/daemon/cluster/controllers/plugin"
 
 import (
 	"errors"

components/engine/daemon/cluster/convert/config.go

@@ -1,4 +1,4 @@
-package convert
+package convert // import "github.com/docker/docker/daemon/cluster/convert"
 
 import (
 	swarmtypes "github.com/docker/docker/api/types/swarm"

components/engine/daemon/cluster/convert/container.go

@@ -1,4 +1,4 @@
-package convert
+package convert // import "github.com/docker/docker/daemon/cluster/convert"
 
 import (
 	"errors"

components/engine/daemon/cluster/convert/network.go

@@ -1,4 +1,4 @@
-package convert
+package convert // import "github.com/docker/docker/daemon/cluster/convert"
 
 import (
 	"strings"

components/engine/daemon/cluster/convert/network_test.go

@@ -1,4 +1,4 @@
-package convert
+package convert // import "github.com/docker/docker/daemon/cluster/convert"
 
 import (
 	"testing"

components/engine/daemon/cluster/convert/node.go

@@ -1,4 +1,4 @@
-package convert
+package convert // import "github.com/docker/docker/daemon/cluster/convert"
 
 import (
 	"fmt"

components/engine/daemon/cluster/convert/secret.go

@@ -1,4 +1,4 @@
-package convert
+package convert // import "github.com/docker/docker/daemon/cluster/convert"
 
 import (
 	swarmtypes "github.com/docker/docker/api/types/swarm"

components/engine/daemon/cluster/convert/service.go

@@ -1,4 +1,4 @@
-package convert
+package convert // import "github.com/docker/docker/daemon/cluster/convert"
 
 import (
 	"fmt"

components/engine/daemon/cluster/convert/service_test.go

@@ -1,4 +1,4 @@
-package convert
+package convert // import "github.com/docker/docker/daemon/cluster/convert"
 
 import (
 	"testing"

components/engine/daemon/cluster/convert/swarm.go

@@ -1,4 +1,4 @@
-package convert
+package convert // import "github.com/docker/docker/daemon/cluster/convert"
 
 import (
 	"fmt"

components/engine/daemon/cluster/convert/task.go

@@ -1,4 +1,4 @@
-package convert
+package convert // import "github.com/docker/docker/daemon/cluster/convert"
 
 import (
 	"strings"

components/engine/daemon/cluster/errors.go

@@ -1,4 +1,4 @@
-package cluster
+package cluster // import "github.com/docker/docker/daemon/cluster"
 
 const (
 	// errNoSwarm is returned on leaving a cluster that was never initialized

components/engine/daemon/cluster/executor/backend.go

@@ -1,4 +1,4 @@
-package executor
+package executor // import "github.com/docker/docker/daemon/cluster/executor"
 
 import (
 	"io"

components/engine/daemon/cluster/executor/container/adapter.go

@@ -1,4 +1,4 @@
-package container
+package container // import "github.com/docker/docker/daemon/cluster/executor/container"
 
 import (
 	"encoding/base64"

components/engine/daemon/cluster/executor/container/attachment.go

@@ -1,4 +1,4 @@
-package container
+package container // import "github.com/docker/docker/daemon/cluster/executor/container"
 
 import (
 	executorpkg "github.com/docker/docker/daemon/cluster/executor"

components/engine/daemon/cluster/executor/container/container.go

@@ -1,4 +1,4 @@
-package container
+package container // import "github.com/docker/docker/daemon/cluster/executor/container"
 
 import (
 	"errors"

components/engine/daemon/cluster/executor/container/container_test.go

@@ -1,4 +1,4 @@
-package container
+package container // import "github.com/docker/docker/daemon/cluster/executor/container"
 
 import (
 	"testing"

components/engine/daemon/cluster/executor/container/controller.go

@@ -1,4 +1,4 @@
-package container
+package container // import "github.com/docker/docker/daemon/cluster/executor/container"
 
 import (
 	"fmt"

components/engine/daemon/cluster/executor/container/errors.go

@@ -1,4 +1,4 @@
-package container
+package container // import "github.com/docker/docker/daemon/cluster/executor/container"
 
 import (
 	"errors"

components/engine/daemon/cluster/executor/container/executor.go

@@ -1,4 +1,4 @@
-package container
+package container // import "github.com/docker/docker/daemon/cluster/executor/container"
 
 import (
 	"fmt"

components/engine/daemon/cluster/executor/container/health_test.go

@@ -1,6 +1,6 @@
 // +build !windows
 
-package container
+package container // import "github.com/docker/docker/daemon/cluster/executor/container"
 
 import (
 	"testing"

components/engine/daemon/cluster/executor/container/validate.go

@@ -1,4 +1,4 @@
-package container
+package container // import "github.com/docker/docker/daemon/cluster/executor/container"
 
 import (
 	"errors"

components/engine/daemon/cluster/executor/container/validate_test.go

@@ -1,4 +1,4 @@
-package container
+package container // import "github.com/docker/docker/daemon/cluster/executor/container"
 
 import (
 	"io/ioutil"

components/engine/daemon/cluster/executor/container/validate_unix_test.go

@@ -1,6 +1,6 @@
 // +build !windows
 
-package container
+package container // import "github.com/docker/docker/daemon/cluster/executor/container"
 
 const (
 	testAbsPath        = "/foo"

components/engine/daemon/cluster/executor/container/validate_windows_test.go

@@ -1,6 +1,6 @@
 // +build windows
 
-package container
+package container // import "github.com/docker/docker/daemon/cluster/executor/container"
 
 const (
 	testAbsPath        = `c:\foo`

components/engine/daemon/cluster/filters.go

@@ -1,4 +1,4 @@
-package cluster
+package cluster // import "github.com/docker/docker/daemon/cluster"
 
 import (
 	"fmt"

components/engine/daemon/cluster/filters_test.go

@@ -1,4 +1,4 @@
-package cluster
+package cluster // import "github.com/docker/docker/daemon/cluster"
 
 import (
 	"testing"

components/engine/daemon/cluster/helpers.go

@@ -1,4 +1,4 @@
-package cluster
+package cluster // import "github.com/docker/docker/daemon/cluster"
 
 import (
 	"fmt"

components/engine/daemon/cluster/listen_addr.go

@@ -1,4 +1,4 @@
-package cluster
+package cluster // import "github.com/docker/docker/daemon/cluster"
 
 import (
 	"fmt"

components/engine/daemon/cluster/listen_addr_linux.go

@@ -1,4 +1,4 @@
-package cluster
+package cluster // import "github.com/docker/docker/daemon/cluster"
 
 import (
 	"net"

components/engine/daemon/cluster/listen_addr_others.go

@@ -1,6 +1,6 @@
 // +build !linux
 
-package cluster
+package cluster // import "github.com/docker/docker/daemon/cluster"
 
 import "net"
 

components/engine/daemon/cluster/networks.go

@@ -1,4 +1,4 @@
-package cluster
+package cluster // import "github.com/docker/docker/daemon/cluster"
 
 import (
 	"fmt"

components/engine/daemon/cluster/noderunner.go

@@ -1,4 +1,4 @@
-package cluster
+package cluster // import "github.com/docker/docker/daemon/cluster"
 
 import (
 	"fmt"

components/engine/daemon/cluster/nodes.go

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

components/engine/daemon/cluster/provider/network.go

@@ -1,4 +1,4 @@
-package provider
+package provider // import "github.com/docker/docker/daemon/cluster/provider"
 
 import "github.com/docker/docker/api/types"
 

components/engine/daemon/cluster/secrets.go

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

components/engine/daemon/cluster/services.go

@@ -1,4 +1,4 @@
-package cluster
+package cluster // import "github.com/docker/docker/daemon/cluster"
 
 import (
 	"encoding/base64"

components/engine/daemon/cluster/swarm.go

@@ -1,4 +1,4 @@
-package cluster
+package cluster // import "github.com/docker/docker/daemon/cluster"
 
 import (
 	"fmt"

components/engine/daemon/cluster/tasks.go

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

components/engine/daemon/cluster/utils.go

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

components/engine/daemon/commit.go

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

components/engine/daemon/config/config.go

@@ -1,4 +1,4 @@
-package config
+package config // import "github.com/docker/docker/daemon/config"
 
 import (
 	"bytes"

components/engine/daemon/config/config_common_unix.go

@@ -1,6 +1,6 @@
 // +build linux freebsd
 
-package config
+package config // import "github.com/docker/docker/daemon/config"
 
 import (
 	"net"

components/engine/daemon/config/config_common_unix_test.go

@@ -1,6 +1,6 @@
 // +build !windows
 
-package config
+package config // import "github.com/docker/docker/daemon/config"
 
 import (
 	"testing"

components/engine/daemon/config/config_test.go

@@ -1,4 +1,4 @@
-package config
+package config // import "github.com/docker/docker/daemon/config"
 
 import (
 	"io/ioutil"

components/engine/daemon/config/config_unix.go

@@ -1,6 +1,6 @@
 // +build linux freebsd
 
-package config
+package config // import "github.com/docker/docker/daemon/config"
 
 import (
 	"fmt"

components/engine/daemon/config/config_unix_test.go

@@ -1,6 +1,6 @@
 // +build !windows
 
-package config
+package config // import "github.com/docker/docker/daemon/config"
 
 import (
 	"testing"

components/engine/daemon/config/config_windows.go

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

components/engine/daemon/config/config_windows_test.go

@@ -1,6 +1,6 @@
 // +build windows
 
-package config
+package config // import "github.com/docker/docker/daemon/config"
 
 import (
 	"io/ioutil"

components/engine/daemon/config/opts.go

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

components/engine/daemon/configs.go

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

components/engine/daemon/configs_linux.go

@@ -1,4 +1,4 @@
-package daemon
+package daemon // import "github.com/docker/docker/daemon"
 
 func configsSupported() bool {
 	return true

components/engine/daemon/configs_unsupported.go

@@ -1,6 +1,6 @@
 // +build !linux,!windows
 
-package daemon
+package daemon // import "github.com/docker/docker/daemon"
 
 func configsSupported() bool {
 	return false

components/engine/daemon/configs_windows.go

@@ -1,4 +1,4 @@
-package daemon
+package daemon // import "github.com/docker/docker/daemon"
 
 func configsSupported() bool {
 	return true

components/engine/daemon/container.go

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

components/engine/daemon/container_linux.go

@@ -1,6 +1,6 @@
 //+build !windows
 
-package daemon
+package daemon // import "github.com/docker/docker/daemon"
 
 import (
 	"github.com/docker/docker/container"

components/engine/daemon/container_operations.go

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

components/engine/daemon/container_operations_unix.go

@@ -1,6 +1,6 @@
 // +build linux freebsd
 
-package daemon
+package daemon // import "github.com/docker/docker/daemon"
 
 import (
 	"context"

components/engine/daemon/container_operations_windows.go

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

components/engine/daemon/container_windows.go

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

components/engine/daemon/create.go

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

components/engine/daemon/create_test.go

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

components/engine/daemon/create_unix.go

@@ -1,6 +1,6 @@
 // +build !windows
 
-package daemon
+package daemon // import "github.com/docker/docker/daemon"
 
 import (
 	"fmt"

components/engine/daemon/create_windows.go

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

components/engine/daemon/daemon.go

@@ -3,7 +3,7 @@
 //
 // In implementing the various functions of the daemon, there is often
 // a method-specific struct for configuring the runtime behavior.
-package daemon
+package daemon // import "github.com/docker/docker/daemon"
 
 import (
 	"context"

components/engine/daemon/daemon_linux.go

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

components/engine/daemon/daemon_linux_test.go

@@ -1,6 +1,6 @@
 // +build linux
 
-package daemon
+package daemon // import "github.com/docker/docker/daemon"
 
 import (
 	"strings"

components/engine/daemon/daemon_test.go

@@ -1,4 +1,4 @@
-package daemon
+package daemon // import "github.com/docker/docker/daemon"
 
 import (
 	"io/ioutil"

components/engine/daemon/daemon_unix.go

@@ -1,6 +1,6 @@
 // +build linux freebsd
 
-package daemon
+package daemon // import "github.com/docker/docker/daemon"
 
 import (
 	"bufio"

components/engine/daemon/daemon_unix_test.go

@@ -1,6 +1,6 @@
 // +build !windows
 
-package daemon
+package daemon // import "github.com/docker/docker/daemon"
 
 import (
 	"errors"

components/engine/daemon/daemon_unsupported.go

@@ -1,5 +1,5 @@
 // +build !linux,!freebsd,!windows
 
-package daemon
+package daemon // import "github.com/docker/docker/daemon"
 
 const platformSupported = false

components/engine/daemon/daemon_windows.go

@@ -1,4 +1,4 @@
-package daemon
+package daemon // import "github.com/docker/docker/daemon"
 
 import (
 	"context"

components/engine/daemon/daemon_windows_test.go

@@ -1,6 +1,6 @@
 // +build windows
 
-package daemon
+package daemon // import "github.com/docker/docker/daemon"
 
 import (
 	"strings"

components/engine/daemon/debugtrap_unix.go

@@ -1,6 +1,6 @@
 // +build !windows
 
-package daemon
+package daemon // import "github.com/docker/docker/daemon"
 
 import (
 	"os"

components/engine/daemon/debugtrap_unsupported.go

@@ -1,6 +1,6 @@
 // +build !linux,!darwin,!freebsd,!windows
 
-package daemon
+package daemon // import "github.com/docker/docker/daemon"
 
 func (d *Daemon) setupDumpStackTrap(_ string) {
 	return

components/engine/daemon/debugtrap_windows.go

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

components/engine/daemon/delete.go

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

components/engine/daemon/delete_test.go

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

components/engine/daemon/dependency.go

@@ -1,4 +1,4 @@
-package daemon
+package daemon // import "github.com/docker/docker/daemon"
 
 import (
 	"github.com/docker/swarmkit/agent/exec"

components/engine/daemon/discovery/discovery.go

@@ -1,4 +1,4 @@
-package discovery
+package discovery // import "github.com/docker/docker/daemon/discovery"
 
 import (
 	"errors"