From 92c98a73232f4555a78620c8faf5701ccea9d11b Mon Sep 17 00:00:00 2001
From: Paul Holzinger <pholzing@redhat.com>
Date: Mon, 23 Oct 2023 15:14:43 +0200
Subject: [PATCH] libimage: add !remote tag

To prevent the podman remote client from using libimage which causes a
lot of bloat due the c/image and c/storage dependencies add the
`!remote` tag.

This will cause a hard compile time failure if the remote client ends up
pulling in libimage.

Fixes #1702

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
---
 common/libimage/copier.go             | 3 +++
 common/libimage/corrupted_test.go     | 3 +++
 common/libimage/disk_usage.go         | 3 +++
 common/libimage/events.go             | 3 +++
 common/libimage/filters.go            | 3 +++
 common/libimage/filters_test.go       | 3 +++
 common/libimage/history.go            | 3 +++
 common/libimage/history_test.go       | 3 +++
 common/libimage/image.go              | 3 +++
 common/libimage/image_config.go       | 3 +++
 common/libimage/image_test.go         | 3 +++
 common/libimage/image_tree.go         | 3 +++
 common/libimage/import.go             | 3 +++
 common/libimage/import_test.go        | 3 +++
 common/libimage/inspect.go            | 3 +++
 common/libimage/layer_tree.go         | 3 +++
 common/libimage/load.go               | 3 +++
 common/libimage/load_test.go          | 3 +++
 common/libimage/manifest_list.go      | 3 +++
 common/libimage/manifest_list_test.go | 3 +++
 common/libimage/normalize.go          | 3 +++
 common/libimage/normalize_test.go     | 3 +++
 common/libimage/oci.go                | 3 +++
 common/libimage/platform.go           | 3 +++
 common/libimage/pull.go               | 3 +++
 common/libimage/pull_test.go          | 3 +++
 common/libimage/push.go               | 3 +++
 common/libimage/push_test.go          | 3 +++
 common/libimage/remove_test.go        | 3 +++
 common/libimage/runtime.go            | 3 +++
 common/libimage/runtime_test.go       | 3 +++
 common/libimage/save.go               | 3 +++
 common/libimage/save_test.go          | 3 +++
 common/libimage/search.go             | 3 +++
 34 files changed, 102 insertions(+)

diff --git a/common/libimage/copier.go b/common/libimage/copier.go
index 9dcc48d245..d6acc73250 100644
--- a/common/libimage/copier.go
+++ b/common/libimage/copier.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libimage
 
 import (
diff --git a/common/libimage/corrupted_test.go b/common/libimage/corrupted_test.go
index eb7291d37f..3438a67795 100644
--- a/common/libimage/corrupted_test.go
+++ b/common/libimage/corrupted_test.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libimage
 
 import (
diff --git a/common/libimage/disk_usage.go b/common/libimage/disk_usage.go
index f27edc03bd..765b0df862 100644
--- a/common/libimage/disk_usage.go
+++ b/common/libimage/disk_usage.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libimage
 
 import (
diff --git a/common/libimage/events.go b/common/libimage/events.go
index c7733564db..5d82efa6a1 100644
--- a/common/libimage/events.go
+++ b/common/libimage/events.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libimage
 
 import (
diff --git a/common/libimage/filters.go b/common/libimage/filters.go
index 9a8663e35a..b51853af19 100644
--- a/common/libimage/filters.go
+++ b/common/libimage/filters.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libimage
 
 import (
diff --git a/common/libimage/filters_test.go b/common/libimage/filters_test.go
index 82ac6f6f1d..e2a41033df 100644
--- a/common/libimage/filters_test.go
+++ b/common/libimage/filters_test.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libimage
 
 import (
diff --git a/common/libimage/history.go b/common/libimage/history.go
index 1e3fa3214c..ccd810962c 100644
--- a/common/libimage/history.go
+++ b/common/libimage/history.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libimage
 
 import (
diff --git a/common/libimage/history_test.go b/common/libimage/history_test.go
index 0102a09207..79a201b1cd 100644
--- a/common/libimage/history_test.go
+++ b/common/libimage/history_test.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libimage
 
 import (
diff --git a/common/libimage/image.go b/common/libimage/image.go
index cc77fc34e1..4d106d42f8 100644
--- a/common/libimage/image.go
+++ b/common/libimage/image.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libimage
 
 import (
diff --git a/common/libimage/image_config.go b/common/libimage/image_config.go
index 69b7debd00..9f5841fe14 100644
--- a/common/libimage/image_config.go
+++ b/common/libimage/image_config.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libimage
 
 import (
diff --git a/common/libimage/image_test.go b/common/libimage/image_test.go
index f12a546ad2..d80b4a23a7 100644
--- a/common/libimage/image_test.go
+++ b/common/libimage/image_test.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libimage
 
 import (
diff --git a/common/libimage/image_tree.go b/common/libimage/image_tree.go
index 9c958ce6b1..8143d3779c 100644
--- a/common/libimage/image_tree.go
+++ b/common/libimage/image_tree.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libimage
 
 import (
diff --git a/common/libimage/import.go b/common/libimage/import.go
index b276c36593..5519f02ba7 100644
--- a/common/libimage/import.go
+++ b/common/libimage/import.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libimage
 
 import (
diff --git a/common/libimage/import_test.go b/common/libimage/import_test.go
index d4ae4d0b39..0e984c4bd9 100644
--- a/common/libimage/import_test.go
+++ b/common/libimage/import_test.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libimage
 
 import (
diff --git a/common/libimage/inspect.go b/common/libimage/inspect.go
index c6632d9a23..1003b6483e 100644
--- a/common/libimage/inspect.go
+++ b/common/libimage/inspect.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libimage
 
 import (
diff --git a/common/libimage/layer_tree.go b/common/libimage/layer_tree.go
index c34b71a874..71eafb0e70 100644
--- a/common/libimage/layer_tree.go
+++ b/common/libimage/layer_tree.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libimage
 
 import (
diff --git a/common/libimage/load.go b/common/libimage/load.go
index 72c56f122a..36283a99b9 100644
--- a/common/libimage/load.go
+++ b/common/libimage/load.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libimage
 
 import (
diff --git a/common/libimage/load_test.go b/common/libimage/load_test.go
index 5198acd451..49d94fe3c0 100644
--- a/common/libimage/load_test.go
+++ b/common/libimage/load_test.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libimage
 
 import (
diff --git a/common/libimage/manifest_list.go b/common/libimage/manifest_list.go
index 6fed12d741..c36bfda968 100644
--- a/common/libimage/manifest_list.go
+++ b/common/libimage/manifest_list.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libimage
 
 import (
diff --git a/common/libimage/manifest_list_test.go b/common/libimage/manifest_list_test.go
index f2053a5d3f..d5c775f948 100644
--- a/common/libimage/manifest_list_test.go
+++ b/common/libimage/manifest_list_test.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libimage
 
 import (
diff --git a/common/libimage/normalize.go b/common/libimage/normalize.go
index 9619b1a0d1..2b3402861d 100644
--- a/common/libimage/normalize.go
+++ b/common/libimage/normalize.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libimage
 
 import (
diff --git a/common/libimage/normalize_test.go b/common/libimage/normalize_test.go
index 50583d9adf..be6b9e40d3 100644
--- a/common/libimage/normalize_test.go
+++ b/common/libimage/normalize_test.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libimage
 
 import (
diff --git a/common/libimage/oci.go b/common/libimage/oci.go
index b88d6613d7..fcbd10ada5 100644
--- a/common/libimage/oci.go
+++ b/common/libimage/oci.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libimage
 
 import (
diff --git a/common/libimage/platform.go b/common/libimage/platform.go
index fc0e002fab..c378bc27ff 100644
--- a/common/libimage/platform.go
+++ b/common/libimage/platform.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libimage
 
 import (
diff --git a/common/libimage/pull.go b/common/libimage/pull.go
index 579eae2c0b..bc8e849816 100644
--- a/common/libimage/pull.go
+++ b/common/libimage/pull.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libimage
 
 import (
diff --git a/common/libimage/pull_test.go b/common/libimage/pull_test.go
index 94695ac2cf..b40f9eb614 100644
--- a/common/libimage/pull_test.go
+++ b/common/libimage/pull_test.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libimage
 
 import (
diff --git a/common/libimage/push.go b/common/libimage/push.go
index 7203838aa6..ed1d90c14b 100644
--- a/common/libimage/push.go
+++ b/common/libimage/push.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libimage
 
 import (
diff --git a/common/libimage/push_test.go b/common/libimage/push_test.go
index 589c4a0eef..b2c3fe637d 100644
--- a/common/libimage/push_test.go
+++ b/common/libimage/push_test.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libimage
 
 import (
diff --git a/common/libimage/remove_test.go b/common/libimage/remove_test.go
index c2bae3b1ef..433c829e9e 100644
--- a/common/libimage/remove_test.go
+++ b/common/libimage/remove_test.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libimage
 
 import (
diff --git a/common/libimage/runtime.go b/common/libimage/runtime.go
index 33f515e99d..1948fe0ad8 100644
--- a/common/libimage/runtime.go
+++ b/common/libimage/runtime.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libimage
 
 import (
diff --git a/common/libimage/runtime_test.go b/common/libimage/runtime_test.go
index 04d6fa480b..91faaf98a0 100644
--- a/common/libimage/runtime_test.go
+++ b/common/libimage/runtime_test.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libimage
 
 import (
diff --git a/common/libimage/save.go b/common/libimage/save.go
index a42bbb4973..47a3a566bd 100644
--- a/common/libimage/save.go
+++ b/common/libimage/save.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libimage
 
 import (
diff --git a/common/libimage/save_test.go b/common/libimage/save_test.go
index 38ab8a0a73..79bd4c7f3a 100644
--- a/common/libimage/save_test.go
+++ b/common/libimage/save_test.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libimage
 
 import (
diff --git a/common/libimage/search.go b/common/libimage/search.go
index 618850e6e1..9ef0e8320f 100644
--- a/common/libimage/search.go
+++ b/common/libimage/search.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libimage
 
 import (