From 7ce4e9685ac4fca828f7758717d32fb8689cd8ab Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Fri, 30 May 2025 12:43:59 +0200
Subject: [PATCH] oci: 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 <github@gone.nl>
---
 oci/caps/defaults.go    | 2 +-
 oci/caps/utils.go       | 2 +-
 oci/caps/utils_linux.go | 3 ++-
 oci/caps/utils_other.go | 2 +-
 oci/defaults.go         | 2 +-
 oci/devices_linux.go    | 2 +-
 oci/namespaces.go       | 2 +-
 oci/oci.go              | 2 +-
 8 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/oci/caps/defaults.go b/oci/caps/defaults.go
index 242ee5811d..27dbfbc325 100644
--- a/oci/caps/defaults.go
+++ b/oci/caps/defaults.go
@@ -1,4 +1,4 @@
-package caps // import "github.com/docker/docker/oci/caps"
+package caps
 
 // DefaultCapabilities returns a Linux kernel default capabilities
 func DefaultCapabilities() []string {
diff --git a/oci/caps/utils.go b/oci/caps/utils.go
index 1cdcf5b7b3..38ff18beb5 100644
--- a/oci/caps/utils.go
+++ b/oci/caps/utils.go
@@ -1,4 +1,4 @@
-package caps // import "github.com/docker/docker/oci/caps"
+package caps
 
 import (
 	"fmt"
diff --git a/oci/caps/utils_linux.go b/oci/caps/utils_linux.go
index 424cd6ea8b..e40b84b5fe 100644
--- a/oci/caps/utils_linux.go
+++ b/oci/caps/utils_linux.go
@@ -1,4 +1,5 @@
-package caps // import "github.com/docker/docker/oci/caps"
+package caps
+
 import (
 	"context"
 	"sync"
diff --git a/oci/caps/utils_other.go b/oci/caps/utils_other.go
index 03c3d9df9f..7c8dbdb9a7 100644
--- a/oci/caps/utils_other.go
+++ b/oci/caps/utils_other.go
@@ -1,6 +1,6 @@
 //go:build !linux
 
-package caps // import "github.com/docker/docker/oci/caps"
+package caps
 
 func initCaps() {
 	// no capabilities on Windows
diff --git a/oci/defaults.go b/oci/defaults.go
index eb3c796459..bc2a5e40dd 100644
--- a/oci/defaults.go
+++ b/oci/defaults.go
@@ -1,7 +1,7 @@
 // TODO(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
 //go:build go1.23
 
-package oci // import "github.com/docker/docker/oci"
+package oci
 
 import (
 	"fmt"
diff --git a/oci/devices_linux.go b/oci/devices_linux.go
index ed0a140f8a..92f8708432 100644
--- a/oci/devices_linux.go
+++ b/oci/devices_linux.go
@@ -1,4 +1,4 @@
-package oci // import "github.com/docker/docker/oci"
+package oci
 
 import (
 	"fmt"
diff --git a/oci/namespaces.go b/oci/namespaces.go
index 4b577a7bc5..27a7628712 100644
--- a/oci/namespaces.go
+++ b/oci/namespaces.go
@@ -1,4 +1,4 @@
-package oci // import "github.com/docker/docker/oci"
+package oci
 
 import "github.com/opencontainers/runtime-spec/specs-go"
 
diff --git a/oci/oci.go b/oci/oci.go
index 8d5443ee00..88e467634b 100644
--- a/oci/oci.go
+++ b/oci/oci.go
@@ -1,4 +1,4 @@
-package oci // import "github.com/docker/docker/oci"
+package oci
 
 import (
 	"fmt"