From 7eecd04c7bb34b58d7c129fb5ac752f1636acfff Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 30 May 2025 12:37:10 +0200 Subject: [PATCH] image: 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 --- image/cache/cache.go | 2 +- image/cache/compare.go | 2 +- image/cache/compare_test.go | 2 +- image/fs.go | 2 +- image/fs_test.go | 2 +- image/image.go | 2 +- image/image_test.go | 2 +- image/rootfs.go | 2 +- image/store.go | 2 +- image/store_test.go | 2 +- image/tarexport/load.go | 2 +- image/tarexport/save.go | 2 +- image/tarexport/tarexport.go | 2 +- image/v1/imagev1.go | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/image/cache/cache.go b/image/cache/cache.go index c45832e4ad..86c59d26d6 100644 --- a/image/cache/cache.go +++ b/image/cache/cache.go @@ -1,4 +1,4 @@ -package cache // import "github.com/docker/docker/image/cache" +package cache import ( "context" diff --git a/image/cache/compare.go b/image/cache/compare.go index f9b4093f00..29a3b0fc86 100644 --- a/image/cache/compare.go +++ b/image/cache/compare.go @@ -1,4 +1,4 @@ -package cache // import "github.com/docker/docker/image/cache" +package cache import ( "strings" diff --git a/image/cache/compare_test.go b/image/cache/compare_test.go index f24311c3c7..dafb9604a0 100644 --- a/image/cache/compare_test.go +++ b/image/cache/compare_test.go @@ -1,4 +1,4 @@ -package cache // import "github.com/docker/docker/image/cache" +package cache import ( "runtime" diff --git a/image/fs.go b/image/fs.go index bf52a656ce..ec690e97b0 100644 --- a/image/fs.go +++ b/image/fs.go @@ -1,4 +1,4 @@ -package image // import "github.com/docker/docker/image" +package image import ( "context" diff --git a/image/fs_test.go b/image/fs_test.go index e9e081970f..a94715518a 100644 --- a/image/fs_test.go +++ b/image/fs_test.go @@ -1,4 +1,4 @@ -package image // import "github.com/docker/docker/image" +package image import ( "crypto/rand" diff --git a/image/image.go b/image/image.go index 116bf9ec52..7cc3f8c934 100644 --- a/image/image.go +++ b/image/image.go @@ -1,4 +1,4 @@ -package image // import "github.com/docker/docker/image" +package image import ( "context" diff --git a/image/image_test.go b/image/image_test.go index b174b80908..19644fc126 100644 --- a/image/image_test.go +++ b/image/image_test.go @@ -1,4 +1,4 @@ -package image // import "github.com/docker/docker/image" +package image import ( "encoding/json" diff --git a/image/rootfs.go b/image/rootfs.go index efccd97eb2..df5021b629 100644 --- a/image/rootfs.go +++ b/image/rootfs.go @@ -1,4 +1,4 @@ -package image // import "github.com/docker/docker/image" +package image import ( "context" diff --git a/image/store.go b/image/store.go index 3671436125..eac157de48 100644 --- a/image/store.go +++ b/image/store.go @@ -1,4 +1,4 @@ -package image // import "github.com/docker/docker/image" +package image import ( "context" diff --git a/image/store_test.go b/image/store_test.go index d3a194283a..08b2a2bfb3 100644 --- a/image/store_test.go +++ b/image/store_test.go @@ -1,4 +1,4 @@ -package image // import "github.com/docker/docker/image" +package image import ( "fmt" diff --git a/image/tarexport/load.go b/image/tarexport/load.go index aaf3819b7c..3713203cd1 100644 --- a/image/tarexport/load.go +++ b/image/tarexport/load.go @@ -1,4 +1,4 @@ -package tarexport // import "github.com/docker/docker/image/tarexport" +package tarexport import ( "context" diff --git a/image/tarexport/save.go b/image/tarexport/save.go index cfbf795acb..9248b8a664 100644 --- a/image/tarexport/save.go +++ b/image/tarexport/save.go @@ -1,4 +1,4 @@ -package tarexport // import "github.com/docker/docker/image/tarexport" +package tarexport import ( "context" diff --git a/image/tarexport/tarexport.go b/image/tarexport/tarexport.go index ab1860ee36..fad6e49bd6 100644 --- a/image/tarexport/tarexport.go +++ b/image/tarexport/tarexport.go @@ -1,4 +1,4 @@ -package tarexport // import "github.com/docker/docker/image/tarexport" +package tarexport import ( "context" diff --git a/image/v1/imagev1.go b/image/v1/imagev1.go index e17b72ae62..352084969f 100644 --- a/image/v1/imagev1.go +++ b/image/v1/imagev1.go @@ -1,4 +1,4 @@ -package v1 // import "github.com/docker/docker/image/v1" +package v1 import ( "context"