Add canonical import comment

Signed-off-by: Daniel Nephin <dnephin@docker.com>

73 files changed, 73 insertions, 73 deletions

diff --git a/builder/builder.go b/builder/builder.go
index b7d5edea0a..12f3daa1a5 100644
--- a/builder/builder.go
+++ b/builder/builder.go
@@ -2,7 +2,7 @@
 //
 // Historically, only server-side Dockerfile interpreters existed.
 // This package allows for other implementations of Docker builders.
-package builder
+package builder // import "github.com/docker/docker/builder"
 
 import (
 	"io"
diff --git a/builder/dockerfile/buildargs.go b/builder/dockerfile/buildargs.go
index c8f34a77a1..93794044e9 100644
--- a/builder/dockerfile/buildargs.go
+++ b/builder/dockerfile/buildargs.go
@@ -1,4 +1,4 @@
-package dockerfile
+package dockerfile // import "github.com/docker/docker/builder/dockerfile"
 
 import (
 	"fmt"
diff --git a/builder/dockerfile/buildargs_test.go b/builder/dockerfile/buildargs_test.go
index 241bc84470..c46dd7d49e 100644
--- a/builder/dockerfile/buildargs_test.go
+++ b/builder/dockerfile/buildargs_test.go
@@ -1,4 +1,4 @@
-package dockerfile
+package dockerfile // import "github.com/docker/docker/builder/dockerfile"
 
 import (
 	"bytes"
diff --git a/builder/dockerfile/builder.go b/builder/dockerfile/builder.go
index a32210ef96..d20bc0403a 100644
--- a/builder/dockerfile/builder.go
+++ b/builder/dockerfile/builder.go
@@ -1,4 +1,4 @@
-package dockerfile
+package dockerfile // import "github.com/docker/docker/builder/dockerfile"
 
 import (
 	"bytes"
diff --git a/builder/dockerfile/builder_test.go b/builder/dockerfile/builder_test.go
index 5fedca0fdd..a3a1f122f9 100644
--- a/builder/dockerfile/builder_test.go
+++ b/builder/dockerfile/builder_test.go
@@ -1,4 +1,4 @@
-package dockerfile
+package dockerfile // import "github.com/docker/docker/builder/dockerfile"
 
 import (
 	"strings"
diff --git a/builder/dockerfile/builder_unix.go b/builder/dockerfile/builder_unix.go
index 91896af5f8..c4453459b3 100644
--- a/builder/dockerfile/builder_unix.go
+++ b/builder/dockerfile/builder_unix.go
@@ -1,6 +1,6 @@
 // +build !windows
 
-package dockerfile
+package dockerfile // import "github.com/docker/docker/builder/dockerfile"
 
 func defaultShellForOS(os string) []string {
 	return []string{"/bin/sh", "-c"}
diff --git a/builder/dockerfile/builder_windows.go b/builder/dockerfile/builder_windows.go
index fa573a0e9c..fbafa52aec 100644
--- a/builder/dockerfile/builder_windows.go
+++ b/builder/dockerfile/builder_windows.go
@@ -1,4 +1,4 @@
-package dockerfile
+package dockerfile // import "github.com/docker/docker/builder/dockerfile"
 
 func defaultShellForOS(os string) []string {
 	if os == "linux" {
diff --git a/builder/dockerfile/clientsession.go b/builder/dockerfile/clientsession.go
index 2ef5bf5462..b4bea50223 100644
--- a/builder/dockerfile/clientsession.go
+++ b/builder/dockerfile/clientsession.go
@@ -1,4 +1,4 @@
-package dockerfile
+package dockerfile // import "github.com/docker/docker/builder/dockerfile"
 
 import (
 	"time"
diff --git a/builder/dockerfile/command/command.go b/builder/dockerfile/command/command.go
index f23c6874b5..303b59096b 100644
--- a/builder/dockerfile/command/command.go
+++ b/builder/dockerfile/command/command.go
@@ -1,5 +1,5 @@
 // Package command contains the set of Dockerfile commands.
-package command
+package command // import "github.com/docker/docker/builder/dockerfile/command"
 
 // Define constants for the command strings
 const (
diff --git a/builder/dockerfile/containerbackend.go b/builder/dockerfile/containerbackend.go
index 523cc5076a..a97d3221e9 100644
--- a/builder/dockerfile/containerbackend.go
+++ b/builder/dockerfile/containerbackend.go
@@ -1,4 +1,4 @@
-package dockerfile
+package dockerfile // import "github.com/docker/docker/builder/dockerfile"
 
 import (
 	"fmt"
diff --git a/builder/dockerfile/copy.go b/builder/dockerfile/copy.go
index 92ba0069dd..f0b27b4c68 100644
--- a/builder/dockerfile/copy.go
+++ b/builder/dockerfile/copy.go
@@ -1,4 +1,4 @@
-package dockerfile
+package dockerfile // import "github.com/docker/docker/builder/dockerfile"
 
 import (
 	"archive/tar"
diff --git a/builder/dockerfile/copy_test.go b/builder/dockerfile/copy_test.go
index 87c5675d90..da8e0711ac 100644
--- a/builder/dockerfile/copy_test.go
+++ b/builder/dockerfile/copy_test.go
@@ -1,4 +1,4 @@
-package dockerfile
+package dockerfile // import "github.com/docker/docker/builder/dockerfile"
 
 import (
 	"net/http"
diff --git a/builder/dockerfile/copy_unix.go b/builder/dockerfile/copy_unix.go
index 8833700554..15453452e5 100644
--- a/builder/dockerfile/copy_unix.go
+++ b/builder/dockerfile/copy_unix.go
@@ -1,6 +1,6 @@
 // +build !windows
 
-package dockerfile
+package dockerfile // import "github.com/docker/docker/builder/dockerfile"
 
 import (
 	"os"
diff --git a/builder/dockerfile/copy_windows.go b/builder/dockerfile/copy_windows.go
index f7fc6e0329..907c34407c 100644
--- a/builder/dockerfile/copy_windows.go
+++ b/builder/dockerfile/copy_windows.go
@@ -1,4 +1,4 @@
-package dockerfile
+package dockerfile // import "github.com/docker/docker/builder/dockerfile"
 
 import (
 	"errors"
diff --git a/builder/dockerfile/dispatchers.go b/builder/dockerfile/dispatchers.go
index 8e37097dd4..828c91d0c8 100644
--- a/builder/dockerfile/dispatchers.go
+++ b/builder/dockerfile/dispatchers.go
@@ -1,4 +1,4 @@
-package dockerfile
+package dockerfile // import "github.com/docker/docker/builder/dockerfile"
 
 // This file contains the dispatchers for each command. Note that
 // `nullDispatch` is not actually a command, but support for commands we parse
diff --git a/builder/dockerfile/dispatchers_test.go b/builder/dockerfile/dispatchers_test.go
index 0cdf2ad437..6b8232e108 100644
--- a/builder/dockerfile/dispatchers_test.go
+++ b/builder/dockerfile/dispatchers_test.go
@@ -1,4 +1,4 @@
-package dockerfile
+package dockerfile // import "github.com/docker/docker/builder/dockerfile"
 
 import (
 	"bytes"
diff --git a/builder/dockerfile/dispatchers_unix.go b/builder/dockerfile/dispatchers_unix.go
index 6a25b598b8..b3ba380323 100644
--- a/builder/dockerfile/dispatchers_unix.go
+++ b/builder/dockerfile/dispatchers_unix.go
@@ -1,6 +1,6 @@
 // +build !windows
 
-package dockerfile
+package dockerfile // import "github.com/docker/docker/builder/dockerfile"
 
 import (
 	"errors"
diff --git a/builder/dockerfile/dispatchers_unix_test.go b/builder/dockerfile/dispatchers_unix_test.go
index 053a38faa1..c2aebfbb27 100644
--- a/builder/dockerfile/dispatchers_unix_test.go
+++ b/builder/dockerfile/dispatchers_unix_test.go
@@ -1,6 +1,6 @@
 // +build !windows
 
-package dockerfile
+package dockerfile // import "github.com/docker/docker/builder/dockerfile"
 
 import (
 	"runtime"
diff --git a/builder/dockerfile/dispatchers_windows.go b/builder/dockerfile/dispatchers_windows.go
index 256ebda9af..7824d1169b 100644
--- a/builder/dockerfile/dispatchers_windows.go
+++ b/builder/dockerfile/dispatchers_windows.go
@@ -1,4 +1,4 @@
-package dockerfile
+package dockerfile // import "github.com/docker/docker/builder/dockerfile"
 
 import (
 	"errors"
diff --git a/builder/dockerfile/dispatchers_windows_test.go b/builder/dockerfile/dispatchers_windows_test.go
index cb0b5446f9..ae72092c4f 100644
--- a/builder/dockerfile/dispatchers_windows_test.go
+++ b/builder/dockerfile/dispatchers_windows_test.go
@@ -1,6 +1,6 @@
 // +build windows
 
-package dockerfile
+package dockerfile // import "github.com/docker/docker/builder/dockerfile"
 
 import "testing"
 
diff --git a/builder/dockerfile/evaluator.go b/builder/dockerfile/evaluator.go
index 8a370d2d5d..74264faf2e 100644
--- a/builder/dockerfile/evaluator.go
+++ b/builder/dockerfile/evaluator.go
@@ -17,7 +17,7 @@
 // before and after each step, such as creating an image ID and removing temporary
 // containers and images. Note that ONBUILD creates a kinda-sorta "sub run" which
 // includes its own set of steps (usually only one of them).
-package dockerfile
+package dockerfile // import "github.com/docker/docker/builder/dockerfile"
 
 import (
 	"reflect"
diff --git a/builder/dockerfile/evaluator_test.go b/builder/dockerfile/evaluator_test.go
index fc5512d0a3..4510133e7c 100644
--- a/builder/dockerfile/evaluator_test.go
+++ b/builder/dockerfile/evaluator_test.go
@@ -1,4 +1,4 @@
-package dockerfile
+package dockerfile // import "github.com/docker/docker/builder/dockerfile"
 
 import (
 	"testing"
diff --git a/builder/dockerfile/imagecontext.go b/builder/dockerfile/imagecontext.go
index a22b60b2e5..f83528e104 100644
--- a/builder/dockerfile/imagecontext.go
+++ b/builder/dockerfile/imagecontext.go
@@ -1,4 +1,4 @@
-package dockerfile
+package dockerfile // import "github.com/docker/docker/builder/dockerfile"
 
 import (
 	"runtime"
diff --git a/builder/dockerfile/imageprobe.go b/builder/dockerfile/imageprobe.go
index 1a6df69385..6960bf8897 100644
--- a/builder/dockerfile/imageprobe.go
+++ b/builder/dockerfile/imageprobe.go
@@ -1,4 +1,4 @@
-package dockerfile
+package dockerfile // import "github.com/docker/docker/builder/dockerfile"
 
 import (
 	"github.com/docker/docker/api/types/container"
diff --git a/builder/dockerfile/instructions/bflag.go b/builder/dockerfile/instructions/bflag.go
index 7a81e3c136..00b9610b38 100644
--- a/builder/dockerfile/instructions/bflag.go
+++ b/builder/dockerfile/instructions/bflag.go
@@ -1,4 +1,4 @@
-package instructions
+package instructions // import "github.com/docker/docker/builder/dockerfile/instructions"
 
 import (
 	"fmt"
diff --git a/builder/dockerfile/instructions/bflag_test.go b/builder/dockerfile/instructions/bflag_test.go
index b194ba785f..d0d203a009 100644
--- a/builder/dockerfile/instructions/bflag_test.go
+++ b/builder/dockerfile/instructions/bflag_test.go
@@ -1,4 +1,4 @@
-package instructions
+package instructions // import "github.com/docker/docker/builder/dockerfile/instructions"
 
 import (
 	"testing"
diff --git a/builder/dockerfile/instructions/commands.go b/builder/dockerfile/instructions/commands.go
index 0863e6b50a..ef435b27b3 100644
--- a/builder/dockerfile/instructions/commands.go
+++ b/builder/dockerfile/instructions/commands.go
@@ -1,4 +1,4 @@
-package instructions
+package instructions // import "github.com/docker/docker/builder/dockerfile/instructions"
 
 import (
 	"errors"
diff --git a/builder/dockerfile/instructions/errors_unix.go b/builder/dockerfile/instructions/errors_unix.go
index 0b03b34cd1..2bd11659e4 100644
--- a/builder/dockerfile/instructions/errors_unix.go
+++ b/builder/dockerfile/instructions/errors_unix.go
@@ -1,6 +1,6 @@
 // +build !windows
 
-package instructions
+package instructions // import "github.com/docker/docker/builder/dockerfile/instructions"
 
 import "fmt"
 
diff --git a/builder/dockerfile/instructions/errors_windows.go b/builder/dockerfile/instructions/errors_windows.go
index a4843c5b6a..be8dbee065 100644
--- a/builder/dockerfile/instructions/errors_windows.go
+++ b/builder/dockerfile/instructions/errors_windows.go
@@ -1,4 +1,4 @@
-package instructions
+package instructions // import "github.com/docker/docker/builder/dockerfile/instructions"
 
 import (
 	"fmt"
diff --git a/builder/dockerfile/instructions/parse.go b/builder/dockerfile/instructions/parse.go
index 0f7c69d263..9226f4d46e 100644
--- a/builder/dockerfile/instructions/parse.go
+++ b/builder/dockerfile/instructions/parse.go
@@ -1,4 +1,4 @@
-package instructions
+package instructions // import "github.com/docker/docker/builder/dockerfile/instructions"
 
 import (
 	"fmt"
diff --git a/builder/dockerfile/instructions/parse_test.go b/builder/dockerfile/instructions/parse_test.go
index 6ac3dfda13..ffd6d4f45c 100644
--- a/builder/dockerfile/instructions/parse_test.go
+++ b/builder/dockerfile/instructions/parse_test.go
@@ -1,4 +1,4 @@
-package instructions
+package instructions // import "github.com/docker/docker/builder/dockerfile/instructions"
 
 import (
 	"strings"
diff --git a/builder/dockerfile/instructions/support.go b/builder/dockerfile/instructions/support.go
index beefe775ce..1d649a77af 100644
--- a/builder/dockerfile/instructions/support.go
+++ b/builder/dockerfile/instructions/support.go
@@ -1,4 +1,4 @@
-package instructions
+package instructions // import "github.com/docker/docker/builder/dockerfile/instructions"
 
 import "strings"
 
diff --git a/builder/dockerfile/instructions/support_test.go b/builder/dockerfile/instructions/support_test.go
index 2b888dca0d..5c79e383db 100644
--- a/builder/dockerfile/instructions/support_test.go
+++ b/builder/dockerfile/instructions/support_test.go
@@ -1,4 +1,4 @@
-package instructions
+package instructions // import "github.com/docker/docker/builder/dockerfile/instructions"
 
 import "testing"
 
diff --git a/builder/dockerfile/internals.go b/builder/dockerfile/internals.go
index 5ce5f89744..3c636fed77 100644
--- a/builder/dockerfile/internals.go
+++ b/builder/dockerfile/internals.go
@@ -1,4 +1,4 @@
-package dockerfile
+package dockerfile // import "github.com/docker/docker/builder/dockerfile"
 
 // internals for handling commands. Covers many areas and a lot of
 // non-contiguous functionality. Please read the comments.
diff --git a/builder/dockerfile/internals_linux.go b/builder/dockerfile/internals_linux.go
index 1314779248..1014b16a21 100644
--- a/builder/dockerfile/internals_linux.go
+++ b/builder/dockerfile/internals_linux.go
@@ -1,4 +1,4 @@
-package dockerfile
+package dockerfile // import "github.com/docker/docker/builder/dockerfile"
 
 import (
 	"path/filepath"
diff --git a/builder/dockerfile/internals_linux_test.go b/builder/dockerfile/internals_linux_test.go
index dd23a33307..08067f8573 100644
--- a/builder/dockerfile/internals_linux_test.go
+++ b/builder/dockerfile/internals_linux_test.go
@@ -1,4 +1,4 @@
-package dockerfile
+package dockerfile // import "github.com/docker/docker/builder/dockerfile"
 
 import (
 	"os"
diff --git a/builder/dockerfile/internals_test.go b/builder/dockerfile/internals_test.go
index 04c8c4bac8..24103ecd8e 100644
--- a/builder/dockerfile/internals_test.go
+++ b/builder/dockerfile/internals_test.go
@@ -1,4 +1,4 @@
-package dockerfile
+package dockerfile // import "github.com/docker/docker/builder/dockerfile"
 
 import (
 	"fmt"
diff --git a/builder/dockerfile/internals_windows.go b/builder/dockerfile/internals_windows.go
index 931df2f02a..26978b48cf 100644
--- a/builder/dockerfile/internals_windows.go
+++ b/builder/dockerfile/internals_windows.go
@@ -1,4 +1,4 @@
-package dockerfile
+package dockerfile // import "github.com/docker/docker/builder/dockerfile"
 
 import "github.com/docker/docker/pkg/idtools"
 
diff --git a/builder/dockerfile/internals_windows_test.go b/builder/dockerfile/internals_windows_test.go
index 6ecc37ba63..08f394ac60 100644
--- a/builder/dockerfile/internals_windows_test.go
+++ b/builder/dockerfile/internals_windows_test.go
@@ -1,6 +1,6 @@
 // +build windows
 
-package dockerfile
+package dockerfile // import "github.com/docker/docker/builder/dockerfile"
 
 import (
 	"fmt"
diff --git a/builder/dockerfile/metrics.go b/builder/dockerfile/metrics.go
index 5aa953aa79..ceafa7ad62 100644
--- a/builder/dockerfile/metrics.go
+++ b/builder/dockerfile/metrics.go
@@ -1,4 +1,4 @@
-package dockerfile
+package dockerfile // import "github.com/docker/docker/builder/dockerfile"
 
 import (
 	"github.com/docker/go-metrics"
diff --git a/builder/dockerfile/mockbackend_test.go b/builder/dockerfile/mockbackend_test.go
index 6c19f17ebc..bf76c0e2e0 100644
--- a/builder/dockerfile/mockbackend_test.go
+++ b/builder/dockerfile/mockbackend_test.go
@@ -1,4 +1,4 @@
-package dockerfile
+package dockerfile // import "github.com/docker/docker/builder/dockerfile"
 
 import (
 	"encoding/json"
diff --git a/builder/dockerfile/parser/json_test.go b/builder/dockerfile/parser/json_test.go
index d4489191da..eddf50bd3f 100644
--- a/builder/dockerfile/parser/json_test.go
+++ b/builder/dockerfile/parser/json_test.go
@@ -1,4 +1,4 @@
-package parser
+package parser // import "github.com/docker/docker/builder/dockerfile/parser"
 
 import (
 	"testing"
diff --git a/builder/dockerfile/parser/line_parsers.go b/builder/dockerfile/parser/line_parsers.go
index 2c375b74e4..94091f5f6b 100644
--- a/builder/dockerfile/parser/line_parsers.go
+++ b/builder/dockerfile/parser/line_parsers.go
@@ -1,4 +1,4 @@
-package parser
+package parser // import "github.com/docker/docker/builder/dockerfile/parser"
 
 // line parsers are dispatch calls that parse a single unit of text into a
 // Node object which contains the whole statement. Dockerfiles have varied
diff --git a/builder/dockerfile/parser/line_parsers_test.go b/builder/dockerfile/parser/line_parsers_test.go
index cf0b21bb51..8ce6a7ad6f 100644
--- a/builder/dockerfile/parser/line_parsers_test.go
+++ b/builder/dockerfile/parser/line_parsers_test.go
@@ -1,4 +1,4 @@
-package parser
+package parser // import "github.com/docker/docker/builder/dockerfile/parser"
 
 import (
 	"testing"
diff --git a/builder/dockerfile/parser/parser.go b/builder/dockerfile/parser/parser.go
index a4bce1cca6..277176ee1c 100644
--- a/builder/dockerfile/parser/parser.go
+++ b/builder/dockerfile/parser/parser.go
@@ -1,5 +1,5 @@
 // Package parser implements a parser and parse tree dumper for Dockerfiles.
-package parser
+package parser // import "github.com/docker/docker/builder/dockerfile/parser"
 
 import (
 	"bufio"
diff --git a/builder/dockerfile/parser/parser_test.go b/builder/dockerfile/parser/parser_test.go
index 7bfbee92e4..807ac1b097 100644
--- a/builder/dockerfile/parser/parser_test.go
+++ b/builder/dockerfile/parser/parser_test.go
@@ -1,4 +1,4 @@
-package parser
+package parser // import "github.com/docker/docker/builder/dockerfile/parser"
 
 import (
 	"bufio"
diff --git a/builder/dockerfile/parser/split_command.go b/builder/dockerfile/parser/split_command.go
index 171f454f6d..6f4fbf5884 100644
--- a/builder/dockerfile/parser/split_command.go
+++ b/builder/dockerfile/parser/split_command.go
@@ -1,4 +1,4 @@
-package parser
+package parser // import "github.com/docker/docker/builder/dockerfile/parser"
 
 import (
 	"strings"
diff --git a/builder/dockerfile/shell/equal_env_unix.go b/builder/dockerfile/shell/equal_env_unix.go
index 6e3f6b890e..ac97a1e16e 100644
--- a/builder/dockerfile/shell/equal_env_unix.go
+++ b/builder/dockerfile/shell/equal_env_unix.go
@@ -1,6 +1,6 @@
 // +build !windows
 
-package shell
+package shell // import "github.com/docker/docker/builder/dockerfile/shell"
 
 // EqualEnvKeys compare two strings and returns true if they are equal. On
 // Windows this comparison is case insensitive.
diff --git a/builder/dockerfile/shell/equal_env_windows.go b/builder/dockerfile/shell/equal_env_windows.go
index 7780fb67e8..4baa771bdf 100644
--- a/builder/dockerfile/shell/equal_env_windows.go
+++ b/builder/dockerfile/shell/equal_env_windows.go
@@ -1,4 +1,4 @@
-package shell
+package shell // import "github.com/docker/docker/builder/dockerfile/shell"
 
 import "strings"
 
diff --git a/builder/dockerfile/shell/lex.go b/builder/dockerfile/shell/lex.go
index e4a5a36942..bd3fac525a 100644
--- a/builder/dockerfile/shell/lex.go
+++ b/builder/dockerfile/shell/lex.go
@@ -1,4 +1,4 @@
-package shell
+package shell // import "github.com/docker/docker/builder/dockerfile/shell"
 
 import (
 	"bytes"
diff --git a/builder/dockerfile/shell/lex_test.go b/builder/dockerfile/shell/lex_test.go
index 14d1a7d12a..6932a44e3d 100644
--- a/builder/dockerfile/shell/lex_test.go
+++ b/builder/dockerfile/shell/lex_test.go
@@ -1,4 +1,4 @@
-package shell
+package shell // import "github.com/docker/docker/builder/dockerfile/shell"
 
 import (
 	"bufio"
diff --git a/builder/dockerfile/utils_test.go b/builder/dockerfile/utils_test.go
index 80a3f1babf..3d615f3460 100644
--- a/builder/dockerfile/utils_test.go
+++ b/builder/dockerfile/utils_test.go
@@ -1,4 +1,4 @@
-package dockerfile
+package dockerfile // import "github.com/docker/docker/builder/dockerfile"
 
 import (
 	"io/ioutil"
diff --git a/builder/dockerignore/dockerignore.go b/builder/dockerignore/dockerignore.go
index cc22381339..57f224afc8 100644
--- a/builder/dockerignore/dockerignore.go
+++ b/builder/dockerignore/dockerignore.go
@@ -1,4 +1,4 @@
-package dockerignore
+package dockerignore // import "github.com/docker/docker/builder/dockerignore"
 
 import (
 	"bufio"
diff --git a/builder/dockerignore/dockerignore_test.go b/builder/dockerignore/dockerignore_test.go
index bda38745cc..06186cc120 100644
--- a/builder/dockerignore/dockerignore_test.go
+++ b/builder/dockerignore/dockerignore_test.go
@@ -1,4 +1,4 @@
-package dockerignore
+package dockerignore // import "github.com/docker/docker/builder/dockerignore"
 
 import (
 	"fmt"
diff --git a/builder/fscache/fscache.go b/builder/fscache/fscache.go
index 679d5e457e..4c00be4289 100644
--- a/builder/fscache/fscache.go
+++ b/builder/fscache/fscache.go
@@ -1,4 +1,4 @@
-package fscache
+package fscache // import "github.com/docker/docker/builder/fscache"
 
 import (
 	"archive/tar"
diff --git a/builder/fscache/fscache_test.go b/builder/fscache/fscache_test.go
index c327ec72d3..7afee49ed5 100644
--- a/builder/fscache/fscache_test.go
+++ b/builder/fscache/fscache_test.go
@@ -1,4 +1,4 @@
-package fscache
+package fscache // import "github.com/docker/docker/builder/fscache"
 
 import (
 	"io/ioutil"
diff --git a/builder/fscache/naivedriver.go b/builder/fscache/naivedriver.go
index f40ee570f4..053509aecf 100644
--- a/builder/fscache/naivedriver.go
+++ b/builder/fscache/naivedriver.go
@@ -1,4 +1,4 @@
-package fscache
+package fscache // import "github.com/docker/docker/builder/fscache"
 
 import (
 	"os"
diff --git a/builder/remotecontext/archive.go b/builder/remotecontext/archive.go
index c670235b61..6d247f945d 100644
--- a/builder/remotecontext/archive.go
+++ b/builder/remotecontext/archive.go
@@ -1,4 +1,4 @@
-package remotecontext
+package remotecontext // import "github.com/docker/docker/builder/remotecontext"
 
 import (
 	"io"
diff --git a/builder/remotecontext/detect.go b/builder/remotecontext/detect.go
index fe5cd967fb..af4e20f886 100644
--- a/builder/remotecontext/detect.go
+++ b/builder/remotecontext/detect.go
@@ -1,4 +1,4 @@
-package remotecontext
+package remotecontext // import "github.com/docker/docker/builder/remotecontext"
 
 import (
 	"bufio"
diff --git a/builder/remotecontext/detect_test.go b/builder/remotecontext/detect_test.go
index 3d1ebd1c3f..04b7686c7a 100644
--- a/builder/remotecontext/detect_test.go
+++ b/builder/remotecontext/detect_test.go
@@ -1,4 +1,4 @@
-package remotecontext
+package remotecontext // import "github.com/docker/docker/builder/remotecontext"
 
 import (
 	"errors"
diff --git a/builder/remotecontext/filehash.go b/builder/remotecontext/filehash.go
index 417230297b..3565dd8279 100644
--- a/builder/remotecontext/filehash.go
+++ b/builder/remotecontext/filehash.go
@@ -1,4 +1,4 @@
-package remotecontext
+package remotecontext // import "github.com/docker/docker/builder/remotecontext"
 
 import (
 	"archive/tar"
diff --git a/builder/remotecontext/generate.go b/builder/remotecontext/generate.go
index 0b52d49926..84c1b3b5ea 100644
--- a/builder/remotecontext/generate.go
+++ b/builder/remotecontext/generate.go
@@ -1,3 +1,3 @@
-package remotecontext
+package remotecontext // import "github.com/docker/docker/builder/remotecontext"
 
 //go:generate protoc --gogoslick_out=. tarsum.proto
diff --git a/builder/remotecontext/git.go b/builder/remotecontext/git.go
index f6fc0bc3fb..1583ca28d0 100644
--- a/builder/remotecontext/git.go
+++ b/builder/remotecontext/git.go
@@ -1,4 +1,4 @@
-package remotecontext
+package remotecontext // import "github.com/docker/docker/builder/remotecontext"
 
 import (
 	"os"
diff --git a/builder/remotecontext/git/gitutils.go b/builder/remotecontext/git/gitutils.go
index 67cff594ab..77a45beff3 100644
--- a/builder/remotecontext/git/gitutils.go
+++ b/builder/remotecontext/git/gitutils.go
@@ -1,4 +1,4 @@
-package git
+package git // import "github.com/docker/docker/builder/remotecontext/git"
 
 import (
 	"io/ioutil"
diff --git a/builder/remotecontext/git/gitutils_test.go b/builder/remotecontext/git/gitutils_test.go
index fd58d6bd98..4f4d833508 100644
--- a/builder/remotecontext/git/gitutils_test.go
+++ b/builder/remotecontext/git/gitutils_test.go
@@ -1,4 +1,4 @@
-package git
+package git // import "github.com/docker/docker/builder/remotecontext/git"
 
 import (
 	"fmt"
diff --git a/builder/remotecontext/lazycontext.go b/builder/remotecontext/lazycontext.go
index 08b8058549..442cecad85 100644
--- a/builder/remotecontext/lazycontext.go
+++ b/builder/remotecontext/lazycontext.go
@@ -1,4 +1,4 @@
-package remotecontext
+package remotecontext // import "github.com/docker/docker/builder/remotecontext"
 
 import (
 	"encoding/hex"
diff --git a/builder/remotecontext/mimetype.go b/builder/remotecontext/mimetype.go
index 083d609978..e8a6210e9c 100644
--- a/builder/remotecontext/mimetype.go
+++ b/builder/remotecontext/mimetype.go
@@ -1,4 +1,4 @@
-package remotecontext
+package remotecontext // import "github.com/docker/docker/builder/remotecontext"
 
 import (
 	"mime"
diff --git a/builder/remotecontext/mimetype_test.go b/builder/remotecontext/mimetype_test.go
index 8c00ec2860..ff097c2e7b 100644
--- a/builder/remotecontext/mimetype_test.go
+++ b/builder/remotecontext/mimetype_test.go
@@ -1,4 +1,4 @@
-package remotecontext
+package remotecontext // import "github.com/docker/docker/builder/remotecontext"
 
 import (
 	"testing"
diff --git a/builder/remotecontext/remote.go b/builder/remotecontext/remote.go
index b67914cc11..1fb80549b8 100644
--- a/builder/remotecontext/remote.go
+++ b/builder/remotecontext/remote.go
@@ -1,4 +1,4 @@
-package remotecontext
+package remotecontext // import "github.com/docker/docker/builder/remotecontext"
 
 import (
 	"bytes"
diff --git a/builder/remotecontext/remote_test.go b/builder/remotecontext/remote_test.go
index 35b105f550..3983bd1b6c 100644
--- a/builder/remotecontext/remote_test.go
+++ b/builder/remotecontext/remote_test.go
@@ -1,4 +1,4 @@
-package remotecontext
+package remotecontext // import "github.com/docker/docker/builder/remotecontext"
 
 import (
 	"bytes"
diff --git a/builder/remotecontext/tarsum.go b/builder/remotecontext/tarsum.go
index 78f7470b37..9e8c7d6072 100644
--- a/builder/remotecontext/tarsum.go
+++ b/builder/remotecontext/tarsum.go
@@ -1,4 +1,4 @@
-package remotecontext
+package remotecontext // import "github.com/docker/docker/builder/remotecontext"
 
 import (
 	"os"
diff --git a/builder/remotecontext/tarsum_test.go b/builder/remotecontext/tarsum_test.go
index 9395460916..3466484981 100644
--- a/builder/remotecontext/tarsum_test.go
+++ b/builder/remotecontext/tarsum_test.go
@@ -1,4 +1,4 @@
-package remotecontext
+package remotecontext // import "github.com/docker/docker/builder/remotecontext"
 
 import (
 	"io/ioutil"
diff --git a/builder/remotecontext/utils_test.go b/builder/remotecontext/utils_test.go
index 1e23ab4f73..6a4c707a6e 100644
--- a/builder/remotecontext/utils_test.go
+++ b/builder/remotecontext/utils_test.go
@@ -1,4 +1,4 @@
-package remotecontext
+package remotecontext // import "github.com/docker/docker/builder/remotecontext"
 
 import (
 	"io/ioutil"