From 0ea03c4addbb7640386127f7bc427b1ca20f3322 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 30 May 2025 12:44:14 +0200 Subject: [PATCH] opts: 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 --- opts/address_pools_test.go | 2 +- opts/env.go | 2 +- opts/env_test.go | 2 +- opts/hosts.go | 2 +- opts/hosts_test.go | 2 +- opts/hosts_unix.go | 2 +- opts/hosts_windows.go | 2 +- opts/opts.go | 2 +- opts/opts_test.go | 2 +- opts/runtime.go | 2 +- opts/ulimit.go | 2 +- opts/ulimit_test.go | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/opts/address_pools_test.go b/opts/address_pools_test.go index 48d40e720d..80b763368d 100644 --- a/opts/address_pools_test.go +++ b/opts/address_pools_test.go @@ -1,4 +1,4 @@ -package opts // import "github.com/docker/docker/opts" +package opts import ( "testing" diff --git a/opts/env.go b/opts/env.go index 74c62ad07f..361b04c60d 100644 --- a/opts/env.go +++ b/opts/env.go @@ -1,4 +1,4 @@ -package opts // import "github.com/docker/docker/opts" +package opts import ( "os" diff --git a/opts/env_test.go b/opts/env_test.go index a277344a29..8f3b3f3197 100644 --- a/opts/env_test.go +++ b/opts/env_test.go @@ -1,4 +1,4 @@ -package opts // import "github.com/docker/docker/opts" +package opts import ( "fmt" diff --git a/opts/hosts.go b/opts/hosts.go index 412c431fd4..ec0914c251 100644 --- a/opts/hosts.go +++ b/opts/hosts.go @@ -1,4 +1,4 @@ -package opts // import "github.com/docker/docker/opts" +package opts import ( "net" diff --git a/opts/hosts_test.go b/opts/hosts_test.go index f7c16e2bab..5ac6f6f588 100644 --- a/opts/hosts_test.go +++ b/opts/hosts_test.go @@ -1,4 +1,4 @@ -package opts // import "github.com/docker/docker/opts" +package opts import ( "fmt" diff --git a/opts/hosts_unix.go b/opts/hosts_unix.go index 2024465cfd..d9baf92ba6 100644 --- a/opts/hosts_unix.go +++ b/opts/hosts_unix.go @@ -1,6 +1,6 @@ //go:build !windows -package opts // import "github.com/docker/docker/opts" +package opts const ( // DefaultHTTPHost Default HTTP Host used if only port is provided to -H flag e.g. dockerd -H tcp://:8080 diff --git a/opts/hosts_windows.go b/opts/hosts_windows.go index 576236ba42..02d16cba7d 100644 --- a/opts/hosts_windows.go +++ b/opts/hosts_windows.go @@ -1,4 +1,4 @@ -package opts // import "github.com/docker/docker/opts" +package opts const ( // TODO Windows. Identify bug in GOLang 1.5.1+ and/or Windows Server 2016 TP5. diff --git a/opts/opts.go b/opts/opts.go index ddc977360a..15445cd283 100644 --- a/opts/opts.go +++ b/opts/opts.go @@ -1,4 +1,4 @@ -package opts // import "github.com/docker/docker/opts" +package opts import ( "fmt" diff --git a/opts/opts_test.go b/opts/opts_test.go index 111bfc45e1..f6bba5f191 100644 --- a/opts/opts_test.go +++ b/opts/opts_test.go @@ -1,4 +1,4 @@ -package opts // import "github.com/docker/docker/opts" +package opts import ( "fmt" diff --git a/opts/runtime.go b/opts/runtime.go index c1ac88e989..4704bae17a 100644 --- a/opts/runtime.go +++ b/opts/runtime.go @@ -1,4 +1,4 @@ -package opts // import "github.com/docker/docker/opts" +package opts import ( "fmt" diff --git a/opts/ulimit.go b/opts/ulimit.go index 2d7c5f0d6a..7d3b39935a 100644 --- a/opts/ulimit.go +++ b/opts/ulimit.go @@ -1,4 +1,4 @@ -package opts // import "github.com/docker/docker/opts" +package opts import ( "fmt" diff --git a/opts/ulimit_test.go b/opts/ulimit_test.go index 857a86eed6..ab40befb31 100644 --- a/opts/ulimit_test.go +++ b/opts/ulimit_test.go @@ -1,4 +1,4 @@ -package opts // import "github.com/docker/docker/opts" +package opts import ( "testing"