From 342f8bca2565fa8227891e7627270b438498afe9 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 30 May 2025 12:27:29 +0200 Subject: [PATCH] builder: remove // import comments These comments were added to enforce using the correct import path for our packages ("github.com/docker/docker", not "github.com/moby/moby"). However, when working in go module mode (not GOPATH / vendor), they have no effect, so their impact is limited. Remove these imports in preparation of migrating our code to become an actual go module. Signed-off-by: Sebastiaan van Stijn --- cli/command/image/build/internal/git/gitutils.go | 2 +- cli/command/image/build/internal/git/gitutils_test.go | 2 +- cli/command/image/build/internal/urlutil/urlutil.go | 2 +- cli/command/image/build/internal/urlutil/urlutil_test.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cli/command/image/build/internal/git/gitutils.go b/cli/command/image/build/internal/git/gitutils.go index d23ebe3375..b02993511f 100644 --- a/cli/command/image/build/internal/git/gitutils.go +++ b/cli/command/image/build/internal/git/gitutils.go @@ -1,4 +1,4 @@ -package git // import "github.com/docker/docker/builder/remotecontext/git" +package git import ( "net/http" diff --git a/cli/command/image/build/internal/git/gitutils_test.go b/cli/command/image/build/internal/git/gitutils_test.go index a37e6ad4ae..204c2477eb 100644 --- a/cli/command/image/build/internal/git/gitutils_test.go +++ b/cli/command/image/build/internal/git/gitutils_test.go @@ -1,4 +1,4 @@ -package git // import "github.com/docker/docker/builder/remotecontext/git" +package git import ( "bytes" diff --git a/cli/command/image/build/internal/urlutil/urlutil.go b/cli/command/image/build/internal/urlutil/urlutil.go index 34c603cbc3..a2225b5960 100644 --- a/cli/command/image/build/internal/urlutil/urlutil.go +++ b/cli/command/image/build/internal/urlutil/urlutil.go @@ -3,7 +3,7 @@ // // This package is specifically written for use with docker build contexts, and // should not be used as a general-purpose utility. -package urlutil // import "github.com/docker/docker/builder/remotecontext/urlutil" +package urlutil import ( "strings" diff --git a/cli/command/image/build/internal/urlutil/urlutil_test.go b/cli/command/image/build/internal/urlutil/urlutil_test.go index ed39f5f22e..f6d0a35de3 100644 --- a/cli/command/image/build/internal/urlutil/urlutil_test.go +++ b/cli/command/image/build/internal/urlutil/urlutil_test.go @@ -1,4 +1,4 @@ -package urlutil // import "github.com/docker/docker/builder/remotecontext/urlutil" +package urlutil import "testing"