From 3615af9037cab741978c365a1330d15ffc6bc799 Mon Sep 17 00:00:00 2001 From: Paul Holzinger Date: Tue, 24 Oct 2023 11:35:09 +0200 Subject: [PATCH 01/10] libpod: remove build support non linux/freebsd There is no need to carry these stub implementations that just error anyway. The libpod package can only ever uses on linux and freebsd anyway and the remote client should never ever import libpod directly. Signed-off-by: Paul Holzinger --- libpod/boltdb_state_unsupported.go | 19 ----- libpod/container_copy_unsupported.go | 17 ---- libpod/container_internal_unsupported.go | 99 ------------------------ libpod/container_stat_unsupported.go | 14 ---- libpod/container_unsupported.go | 7 -- libpod/info_unsupported.go | 14 ---- libpod/networking_unsupported.go | 87 --------------------- libpod/oci_conmon_unsupported.go | 24 ------ libpod/pod_top_unsupported.go | 20 ----- libpod/runtime_pod_unsupported.go | 30 ------- libpod/runtime_volume_unsupported.go | 42 ---------- libpod/stats_unsupported.go | 17 ---- libpod/util_unsupported.go | 27 ------- libpod/volume_internal_unsupported.go | 32 -------- 14 files changed, 449 deletions(-) delete mode 100644 libpod/boltdb_state_unsupported.go delete mode 100644 libpod/container_copy_unsupported.go delete mode 100644 libpod/container_internal_unsupported.go delete mode 100644 libpod/container_stat_unsupported.go delete mode 100644 libpod/container_unsupported.go delete mode 100644 libpod/info_unsupported.go delete mode 100644 libpod/networking_unsupported.go delete mode 100644 libpod/oci_conmon_unsupported.go delete mode 100644 libpod/pod_top_unsupported.go delete mode 100644 libpod/runtime_pod_unsupported.go delete mode 100644 libpod/runtime_volume_unsupported.go delete mode 100644 libpod/stats_unsupported.go delete mode 100644 libpod/util_unsupported.go delete mode 100644 libpod/volume_internal_unsupported.go diff --git a/libpod/boltdb_state_unsupported.go b/libpod/boltdb_state_unsupported.go deleted file mode 100644 index 9db1e3c4bc..0000000000 --- a/libpod/boltdb_state_unsupported.go +++ /dev/null @@ -1,19 +0,0 @@ -//go:build !linux && !freebsd -// +build !linux,!freebsd - -package libpod - -import ( - "errors" -) - -// replaceNetNS handle network namespace transitions after updating a -// container's state. -func replaceNetNS(netNSPath string, ctr *Container, newState *ContainerState) error { - return errors.New("replaceNetNS not supported on this platform") -} - -// getNetNSPath retrieves the netns path to be stored in the database -func getNetNSPath(ctr *Container) string { - return "" -} diff --git a/libpod/container_copy_unsupported.go b/libpod/container_copy_unsupported.go deleted file mode 100644 index 703b0a74ed..0000000000 --- a/libpod/container_copy_unsupported.go +++ /dev/null @@ -1,17 +0,0 @@ -//go:build !linux && !freebsd -// +build !linux,!freebsd - -package libpod - -import ( - "errors" - "io" -) - -func (c *Container) copyFromArchive(path string, chown, noOverwriteDirNonDir bool, rename map[string]string, reader io.Reader) (func() error, error) { - return nil, errors.New("not implemented (*Container) copyFromArchive") -} - -func (c *Container) copyToArchive(path string, writer io.Writer) (func() error, error) { - return nil, errors.New("not implemented (*Container) copyToArchive") -} diff --git a/libpod/container_internal_unsupported.go b/libpod/container_internal_unsupported.go deleted file mode 100644 index 1967c577b3..0000000000 --- a/libpod/container_internal_unsupported.go +++ /dev/null @@ -1,99 +0,0 @@ -//go:build !linux && !freebsd -// +build !linux,!freebsd - -package libpod - -import ( - "context" - "errors" - - "github.com/containers/common/libnetwork/etchosts" - "github.com/containers/podman/v4/libpod/define" - "github.com/containers/podman/v4/pkg/lookup" - spec "github.com/opencontainers/runtime-spec/specs-go" -) - -func (c *Container) mountSHM(shmOptions string) error { - return errors.New("not implemented (*Container) mountSHM") -} - -func (c *Container) unmountSHM(mount string) error { - return errors.New("not implemented (*Container) unmountSHM") -} - -func (c *Container) cleanupOverlayMounts() error { - return errors.New("not implemented (*Container) cleanupOverlayMounts") -} - -// prepare mounts the container and sets up other required resources like net -// namespaces -func (c *Container) prepare() error { - return errors.New("not implemented (*Container) prepare") -} - -// resolveWorkDir resolves the container's workdir and, depending on the -// configuration, will create it, or error out if it does not exist. -// Note that the container must be mounted before. -func (c *Container) resolveWorkDir() error { - return errors.New("not implemented (*Container) resolveWorkDir") -} - -// cleanupNetwork unmounts and cleans up the container's network -func (c *Container) cleanupNetwork() error { - return errors.New("not implemented (*Container) cleanupNetwork") -} - -// reloadNetwork reloads the network for the given container, recreating -// firewall rules. -func (c *Container) reloadNetwork() error { - return errors.New("not implemented (*Container) reloadNetwork") -} - -// Generate spec for a container -// Accepts a map of the container's dependencies -func (c *Container) generateSpec(ctx context.Context) (*spec.Spec, error) { - return nil, errors.New("not implemented (*Container) generateSpec") -} - -func (c *Container) getUserOverrides() *lookup.Overrides { - return &lookup.Overrides{} -} - -func (c *Container) checkpoint(ctx context.Context, options ContainerCheckpointOptions) (*define.CRIUCheckpointRestoreStatistics, int64, error) { - return nil, 0, errors.New("not implemented (*Container) checkpoint") -} - -func (c *Container) restore(ctx context.Context, options ContainerCheckpointOptions) (criuStatistics *define.CRIUCheckpointRestoreStatistics, runtimeRestoreDuration int64, retErr error) { - return nil, 0, errors.New("not implemented (*Container) restore") -} - -// getHostsEntries returns the container ip host entries for the correct netmode -func (c *Container) getHostsEntries() (etchosts.HostEntries, error) { - return nil, errors.New("unsupported (*Container) getHostsEntries") -} - -// Fix ownership and permissions of the specified volume if necessary. -func (c *Container) fixVolumePermissions(v *ContainerNamedVolume) error { - return errors.New("unsupported (*Container) fixVolumePermissions") -} - -func (c *Container) expectPodCgroup() (bool, error) { - return false, errors.New("unsupported (*Container) expectPodCgroup") -} - -// Get cgroup path in a format suitable for the OCI spec -func (c *Container) getOCICgroupPath() (string, error) { - return "", errors.New("unsupported (*Container) getOCICgroupPath") -} - -func getLocalhostHostEntry(c *Container) etchosts.HostEntries { - return nil -} - -func isRootlessCgroupSet(cgroup string) bool { - return false -} - -func openDirectory(path string) (fd int, err error) { - return -1, errors.New("unsupported openDirectory") -} diff --git a/libpod/container_stat_unsupported.go b/libpod/container_stat_unsupported.go deleted file mode 100644 index e88b88bb1f..0000000000 --- a/libpod/container_stat_unsupported.go +++ /dev/null @@ -1,14 +0,0 @@ -//go:build !linux && !freebsd -// +build !linux,!freebsd - -package libpod - -import ( - "errors" - - "github.com/containers/podman/v4/libpod/define" -) - -func (c *Container) stat(containerMountPoint string, containerPath string) (*define.FileInfo, string, string, error) { - return nil, "", "", errors.New("Containers stat not supported on this platform") -} diff --git a/libpod/container_unsupported.go b/libpod/container_unsupported.go deleted file mode 100644 index 16bf11622b..0000000000 --- a/libpod/container_unsupported.go +++ /dev/null @@ -1,7 +0,0 @@ -//go:build !linux && !freebsd -// +build !linux,!freebsd - -package libpod - -type containerPlatformState struct { -} diff --git a/libpod/info_unsupported.go b/libpod/info_unsupported.go deleted file mode 100644 index 0aed51247d..0000000000 --- a/libpod/info_unsupported.go +++ /dev/null @@ -1,14 +0,0 @@ -//go:build !linux && !freebsd -// +build !linux,!freebsd - -package libpod - -import ( - "errors" - - "github.com/containers/podman/v4/libpod/define" -) - -func (r *Runtime) info() (*define.Info, error) { - return nil, errors.New("not implemented (*Runtime) info") -} diff --git a/libpod/networking_unsupported.go b/libpod/networking_unsupported.go deleted file mode 100644 index ff10122972..0000000000 --- a/libpod/networking_unsupported.go +++ /dev/null @@ -1,87 +0,0 @@ -//go:build !linux && !freebsd -// +build !linux,!freebsd - -package libpod - -import ( - "errors" - "net" - "path/filepath" - - "github.com/containers/common/libnetwork/types" - "github.com/containers/podman/v4/libpod/define" - "github.com/containers/storage/pkg/lockfile" -) - -type RootlessNetNS struct { - dir string - Lock *lockfile.LockFile -} - -// ocicniPortsToNetTypesPorts convert the old port format to the new one -// while deduplicating ports into ranges -func ocicniPortsToNetTypesPorts(ports []types.OCICNIPortMapping) []types.PortMapping { - return []types.PortMapping{} -} - -func (c *Container) getContainerNetworkInfo() (*define.InspectNetworkSettings, error) { - return nil, errors.New("not implemented (*Container) getContainerNetworkInfo") -} - -func (c *Container) setupRootlessNetwork() error { - return errors.New("not implemented (*Container) setupRootlessNetwork") -} - -func (r *Runtime) setupNetNS(ctr *Container) error { - return errors.New("not implemented (*Runtime) setupNetNS") -} - -// normalizeNetworkName takes a network name, a partial or a full network ID and returns the network name. -// If the network is not found an error is returned. -func (r *Runtime) normalizeNetworkName(nameOrID string) (string, error) { - return "", errors.New("not implemented (*Runtime) normalizeNetworkName") -} - -// DisconnectContainerFromNetwork removes a container from its network -func (r *Runtime) DisconnectContainerFromNetwork(nameOrID, netName string, force bool) error { - return errors.New("not implemented (*Runtime) DisconnectContainerFromNetwork") -} - -// ConnectContainerToNetwork connects a container to a network -func (r *Runtime) ConnectContainerToNetwork(nameOrID, netName string, netOpts types.PerNetworkOptions) error { - return errors.New("not implemented (*Runtime) ConnectContainerToNetwork") -} - -// getPath will join the given path to the rootless netns dir -func (r *RootlessNetNS) getPath(path string) string { - return filepath.Join(r.dir, path) -} - -// Do - run the given function in the rootless netns. -// It does not lock the rootlessCNI lock, the caller -// should only lock when needed, e.g. for network operations. -func (r *RootlessNetNS) Do(toRun func() error) error { - return errors.New("not implemented (*RootlessNetNS) Do") -} - -// Cleanup the rootless network namespace if needed. -// It checks if we have running containers with the bridge network mode. -// Cleanup() expects that r.Lock is locked -func (r *RootlessNetNS) Cleanup(runtime *Runtime) error { - return errors.New("not implemented (*RootlessNetNS) Cleanup") -} - -// GetRootlessNetNs returns the rootless netns object. If create is set to true -// the rootless network namespace will be created if it does not already exist. -// If called as root it returns always nil. -// On success the returned RootlessCNI lock is locked and must be unlocked by the caller. -func (r *Runtime) GetRootlessNetNs(new bool) (*RootlessNetNS, error) { - return nil, errors.New("not implemented (*Runtime) GetRootlessNetNs") -} - -// convertPortMappings will remove the HostIP part from the ports when running inside podman machine. -// This is needed because a HostIP of 127.0.0.1 would now allow the gvproxy forwarder to reach to open ports. -// For machine the HostIP must only be used by gvproxy and never in the VM. -func (c *Container) convertPortMappings() []types.PortMapping { - return []types.PortMapping{} -} diff --git a/libpod/oci_conmon_unsupported.go b/libpod/oci_conmon_unsupported.go deleted file mode 100644 index cc6d68e894..0000000000 --- a/libpod/oci_conmon_unsupported.go +++ /dev/null @@ -1,24 +0,0 @@ -//go:build !linux && !freebsd -// +build !linux,!freebsd - -package libpod - -import ( - "errors" - - "github.com/containers/common/pkg/config" - "github.com/containers/common/pkg/resize" -) - -// Make a new Conmon-based OCI runtime with the given options. -// Conmon will wrap the given OCI runtime, which can be `runc`, `crun`, or -// any runtime with a runc-compatible CLI. -// The first path that points to a valid executable will be used. -// Deliberately private. Someone should not be able to construct this outside of -// libpod. -func newConmonOCIRuntime(name string, paths []string, conmonPath string, runtimeFlags []string, runtimeCfg *config.Config) (OCIRuntime, error) { - return nil, errors.New("newConmonOCIRuntime not supported on this platform") -} - -func registerResizeFunc(r <-chan resize.TerminalSize, bundlePath string) { -} diff --git a/libpod/pod_top_unsupported.go b/libpod/pod_top_unsupported.go deleted file mode 100644 index 193bb61386..0000000000 --- a/libpod/pod_top_unsupported.go +++ /dev/null @@ -1,20 +0,0 @@ -//go:build !linux && !freebsd -// +build !linux,!freebsd - -package libpod - -import ( - "errors" -) - -// GetPodPidInformation returns process-related data of all processes in -// the pod. The output data can be controlled via the `descriptors` -// argument which expects format descriptors and supports all AIXformat -// descriptors of ps (1) plus some additional ones to for instance inspect the -// set of effective capabilities. Each element in the returned string slice -// is a tab-separated string. -// -// For more details, please refer to github.com/containers/psgo. -func (p *Pod) GetPodPidInformation(descriptors []string) ([]string, error) { - return nil, errors.New("not implemented (*Pod) GetPodPidInformation") -} diff --git a/libpod/runtime_pod_unsupported.go b/libpod/runtime_pod_unsupported.go deleted file mode 100644 index 1e32d3d513..0000000000 --- a/libpod/runtime_pod_unsupported.go +++ /dev/null @@ -1,30 +0,0 @@ -//go:build !linux && !freebsd -// +build !linux,!freebsd - -package libpod - -import ( - "context" - "errors" - - "github.com/containers/podman/v4/pkg/specgen" -) - -// NewPod makes a new, empty pod -func (r *Runtime) NewPod(ctx context.Context, p specgen.PodSpecGenerator, options ...PodCreateOption) (_ *Pod, deferredErr error) { - return nil, errors.New("not implemented (*Runtime) NewPod") -} - -// AddInfra adds the created infra container to the pod state -func (r *Runtime) AddInfra(ctx context.Context, pod *Pod, infraCtr *Container) (*Pod, error) { - return nil, errors.New("not implemented (*Runtime) AddInfra") -} - -// SavePod is a helper function to save the pod state from outside of libpod -func (r *Runtime) SavePod(pod *Pod) error { - return errors.New("not implemented (*Runtime) SavePod") -} - -func (r *Runtime) removePod(ctx context.Context, p *Pod, removeCtrs, force bool, timeout *uint) error { - return errors.New("not implemented (*Runtime) removePod") -} diff --git a/libpod/runtime_volume_unsupported.go b/libpod/runtime_volume_unsupported.go deleted file mode 100644 index 7b77588948..0000000000 --- a/libpod/runtime_volume_unsupported.go +++ /dev/null @@ -1,42 +0,0 @@ -//go:build !linux && !freebsd -// +build !linux,!freebsd - -package libpod - -import ( - "context" - "errors" - - "github.com/containers/podman/v4/libpod/define" -) - -// NewVolume creates a new empty volume -func (r *Runtime) NewVolume(ctx context.Context, options ...VolumeCreateOption) (*Volume, error) { - if !r.valid { - return nil, define.ErrRuntimeStopped - } - return r.newVolume(false, options...) -} - -// NewVolume creates a new empty volume -func (r *Runtime) newVolume(noCreatePluginVolume bool, options ...VolumeCreateOption) (*Volume, error) { - return nil, errors.New("not implemented (*Runtime) newVolume") -} - -// UpdateVolumePlugins reads all volumes from all configured volume plugins and -// imports them into the libpod db. It also checks if existing libpod volumes -// are removed in the plugin, in this case we try to remove it from libpod. -// On errors we continue and try to do as much as possible. all errors are -// returned as array in the returned struct. -// This function has many race conditions, it is best effort but cannot guarantee -// a perfect state since plugins can be modified from the outside at any time. -func (r *Runtime) UpdateVolumePlugins(ctx context.Context) *define.VolumeReload { - return nil -} - -// removeVolume removes the specified volume from state as well tears down its mountpoint and storage. -// ignoreVolumePlugin is used to only remove the volume from the db and not the plugin, -// this is required when the volume was already removed from the plugin, i.e. in UpdateVolumePlugins(). -func (r *Runtime) removeVolume(ctx context.Context, v *Volume, force bool, timeout *uint, ignoreVolumePlugin bool) error { - return errors.New("not implemented (*Runtime) removeVolume") -} diff --git a/libpod/stats_unsupported.go b/libpod/stats_unsupported.go deleted file mode 100644 index 3094e2eaac..0000000000 --- a/libpod/stats_unsupported.go +++ /dev/null @@ -1,17 +0,0 @@ -//go:build !linux && !freebsd -// +build !linux,!freebsd - -package libpod - -import ( - "errors" - - "github.com/containers/podman/v4/libpod/define" -) - -// GetContainerStats gets the running stats for a given container. -// The previousStats is used to correctly calculate cpu percentages. You -// should pass nil if there is no previous stat for this container. -func (c *Container) GetContainerStats(previousStats *define.ContainerStats) (*define.ContainerStats, error) { - return nil, errors.New("not implemented (*Container) GetContainerStats") -} diff --git a/libpod/util_unsupported.go b/libpod/util_unsupported.go deleted file mode 100644 index f38213a100..0000000000 --- a/libpod/util_unsupported.go +++ /dev/null @@ -1,27 +0,0 @@ -//go:build !linux && !freebsd -// +build !linux,!freebsd - -package libpod - -import ( - "errors" - - spec "github.com/opencontainers/runtime-spec/specs-go" -) - -// systemdSliceFromPath makes a new systemd slice under the given parent with -// the given name. -// The parent must be a slice. The name must NOT include ".slice" -func systemdSliceFromPath(parent, name string, resources *spec.LinuxResources) (string, error) { - return "", errors.New("not implemented systemdSliceFromPath") -} - -// Unmount umounts a target directory -func Unmount(mount string) { -} - -// LabelVolumePath takes a mount path for a volume and gives it an -// selinux label of either shared or not -func LabelVolumePath(path, mountLabel string) error { - return errors.New("not implemented LabelVolumePath") -} diff --git a/libpod/volume_internal_unsupported.go b/libpod/volume_internal_unsupported.go deleted file mode 100644 index d138c15fb5..0000000000 --- a/libpod/volume_internal_unsupported.go +++ /dev/null @@ -1,32 +0,0 @@ -//go:build !linux && !freebsd -// +build !linux,!freebsd - -package libpod - -import ( - "errors" -) - -// mount mounts the volume if necessary. -// A mount is necessary if a volume has any options set. -// If a mount is necessary, v.state.MountCount will be incremented. -// If it was 0 when the increment occurred, the volume will be mounted on the -// host. Otherwise, we assume it is already mounted. -// Must be done while the volume is locked. -// Is a no-op on volumes that do not require a mount (as defined by -// volumeNeedsMount()). -func (v *Volume) mount() error { - return errors.New("not implemented (*Volume) mount") -} - -// unmount unmounts the volume if necessary. -// Unmounting a volume that is not mounted is a no-op. -// Unmounting a volume that does not require a mount is a no-op. -// The volume must be locked for this to occur. -// The mount counter will be decremented if non-zero. If the counter reaches 0, -// the volume will really be unmounted, as no further containers are using the -// volume. -// If force is set, the volume will be unmounted regardless of mount counter. -func (v *Volume) unmount(force bool) error { - return errors.New("not implemented (*Volume) unmount") -} From 01a750699e0d7517f508f927fcf8585eef9b0778 Mon Sep 17 00:00:00 2001 From: Paul Holzinger Date: Tue, 24 Oct 2023 11:43:40 +0200 Subject: [PATCH 02/10] vendor latest c/common This adds the !remote tag to c/common/libimage which prenents the remote client from using it. Signed-off-by: Paul Holzinger --- go.mod | 2 +- go.sum | 4 ++-- vendor/github.com/containers/common/libimage/copier.go | 3 +++ vendor/github.com/containers/common/libimage/disk_usage.go | 3 +++ vendor/github.com/containers/common/libimage/events.go | 3 +++ vendor/github.com/containers/common/libimage/filters.go | 3 +++ vendor/github.com/containers/common/libimage/history.go | 3 +++ vendor/github.com/containers/common/libimage/image.go | 3 +++ vendor/github.com/containers/common/libimage/image_config.go | 3 +++ vendor/github.com/containers/common/libimage/image_tree.go | 3 +++ vendor/github.com/containers/common/libimage/import.go | 3 +++ vendor/github.com/containers/common/libimage/inspect.go | 3 +++ vendor/github.com/containers/common/libimage/layer_tree.go | 3 +++ vendor/github.com/containers/common/libimage/load.go | 3 +++ vendor/github.com/containers/common/libimage/manifest_list.go | 3 +++ vendor/github.com/containers/common/libimage/normalize.go | 3 +++ vendor/github.com/containers/common/libimage/oci.go | 3 +++ vendor/github.com/containers/common/libimage/platform.go | 3 +++ vendor/github.com/containers/common/libimage/pull.go | 3 +++ vendor/github.com/containers/common/libimage/push.go | 3 +++ vendor/github.com/containers/common/libimage/runtime.go | 3 +++ vendor/github.com/containers/common/libimage/save.go | 3 +++ vendor/github.com/containers/common/libimage/search.go | 3 +++ vendor/modules.txt | 2 +- 24 files changed, 67 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 6dd4358802..49d7ee1232 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/containernetworking/cni v1.1.2 github.com/containernetworking/plugins v1.3.0 github.com/containers/buildah v1.32.1-0.20231016164031-ade05159a485 - github.com/containers/common v0.56.1-0.20231023085521-d3170cb89b07 + github.com/containers/common v0.56.1-0.20231023143107-8d0bd259cb7c github.com/containers/conmon v2.0.20+incompatible github.com/containers/gvisor-tap-vsock v0.7.1 github.com/containers/image/v5 v5.28.0 diff --git a/go.sum b/go.sum index 8852cecc0c..42c4d53414 100644 --- a/go.sum +++ b/go.sum @@ -251,8 +251,8 @@ github.com/containernetworking/plugins v1.3.0 h1:QVNXMT6XloyMUoO2wUOqWTC1hWFV62Q github.com/containernetworking/plugins v1.3.0/go.mod h1:Pc2wcedTQQCVuROOOaLBPPxrEXqqXBFt3cZ+/yVg6l0= github.com/containers/buildah v1.32.1-0.20231016164031-ade05159a485 h1:RqgxHW2iP5QJ3aRahT+KGI2aGXVZeZHTeulmeZQV0y0= github.com/containers/buildah v1.32.1-0.20231016164031-ade05159a485/go.mod h1:gOMfotERP5Gz2pN+AnuM3ephId/YL9DmbOtVck6fWfE= -github.com/containers/common v0.56.1-0.20231023085521-d3170cb89b07 h1:OTiZ6TcimBmxGbBe/q2Ju33Kz1XetPoq0cDq/Aw0LDw= -github.com/containers/common v0.56.1-0.20231023085521-d3170cb89b07/go.mod h1:NGMoofxxOF8tno51JlwACw0HaUwaPS66h2N7CYJGFC0= +github.com/containers/common v0.56.1-0.20231023143107-8d0bd259cb7c h1:+5wIm8TWi18iu/WZhF6T9x693nmfpP9yqyrKCreDOOU= +github.com/containers/common v0.56.1-0.20231023143107-8d0bd259cb7c/go.mod h1:NGMoofxxOF8tno51JlwACw0HaUwaPS66h2N7CYJGFC0= github.com/containers/conmon v2.0.20+incompatible h1:YbCVSFSCqFjjVwHTPINGdMX1F6JXHGTUje2ZYobNrkg= github.com/containers/conmon v2.0.20+incompatible/go.mod h1:hgwZ2mtuDrppv78a/cOBNiCm6O0UMWGx1mu7P00nu5I= github.com/containers/gvisor-tap-vsock v0.7.1 h1:+Rc+sOPplrkQb/BUXeN0ug8TxjgyrIqo/9P/eNS2A4c= diff --git a/vendor/github.com/containers/common/libimage/copier.go b/vendor/github.com/containers/common/libimage/copier.go index 9dcc48d245..d6acc73250 100644 --- a/vendor/github.com/containers/common/libimage/copier.go +++ b/vendor/github.com/containers/common/libimage/copier.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libimage import ( diff --git a/vendor/github.com/containers/common/libimage/disk_usage.go b/vendor/github.com/containers/common/libimage/disk_usage.go index f27edc03bd..765b0df862 100644 --- a/vendor/github.com/containers/common/libimage/disk_usage.go +++ b/vendor/github.com/containers/common/libimage/disk_usage.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libimage import ( diff --git a/vendor/github.com/containers/common/libimage/events.go b/vendor/github.com/containers/common/libimage/events.go index c7733564db..5d82efa6a1 100644 --- a/vendor/github.com/containers/common/libimage/events.go +++ b/vendor/github.com/containers/common/libimage/events.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libimage import ( diff --git a/vendor/github.com/containers/common/libimage/filters.go b/vendor/github.com/containers/common/libimage/filters.go index 9a8663e35a..b51853af19 100644 --- a/vendor/github.com/containers/common/libimage/filters.go +++ b/vendor/github.com/containers/common/libimage/filters.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libimage import ( diff --git a/vendor/github.com/containers/common/libimage/history.go b/vendor/github.com/containers/common/libimage/history.go index 1e3fa3214c..ccd810962c 100644 --- a/vendor/github.com/containers/common/libimage/history.go +++ b/vendor/github.com/containers/common/libimage/history.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libimage import ( diff --git a/vendor/github.com/containers/common/libimage/image.go b/vendor/github.com/containers/common/libimage/image.go index cc77fc34e1..4d106d42f8 100644 --- a/vendor/github.com/containers/common/libimage/image.go +++ b/vendor/github.com/containers/common/libimage/image.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libimage import ( diff --git a/vendor/github.com/containers/common/libimage/image_config.go b/vendor/github.com/containers/common/libimage/image_config.go index 69b7debd00..9f5841fe14 100644 --- a/vendor/github.com/containers/common/libimage/image_config.go +++ b/vendor/github.com/containers/common/libimage/image_config.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libimage import ( diff --git a/vendor/github.com/containers/common/libimage/image_tree.go b/vendor/github.com/containers/common/libimage/image_tree.go index 9c958ce6b1..8143d3779c 100644 --- a/vendor/github.com/containers/common/libimage/image_tree.go +++ b/vendor/github.com/containers/common/libimage/image_tree.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libimage import ( diff --git a/vendor/github.com/containers/common/libimage/import.go b/vendor/github.com/containers/common/libimage/import.go index b276c36593..5519f02ba7 100644 --- a/vendor/github.com/containers/common/libimage/import.go +++ b/vendor/github.com/containers/common/libimage/import.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libimage import ( diff --git a/vendor/github.com/containers/common/libimage/inspect.go b/vendor/github.com/containers/common/libimage/inspect.go index c6632d9a23..1003b6483e 100644 --- a/vendor/github.com/containers/common/libimage/inspect.go +++ b/vendor/github.com/containers/common/libimage/inspect.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libimage import ( diff --git a/vendor/github.com/containers/common/libimage/layer_tree.go b/vendor/github.com/containers/common/libimage/layer_tree.go index c34b71a874..71eafb0e70 100644 --- a/vendor/github.com/containers/common/libimage/layer_tree.go +++ b/vendor/github.com/containers/common/libimage/layer_tree.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libimage import ( diff --git a/vendor/github.com/containers/common/libimage/load.go b/vendor/github.com/containers/common/libimage/load.go index 72c56f122a..36283a99b9 100644 --- a/vendor/github.com/containers/common/libimage/load.go +++ b/vendor/github.com/containers/common/libimage/load.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libimage import ( diff --git a/vendor/github.com/containers/common/libimage/manifest_list.go b/vendor/github.com/containers/common/libimage/manifest_list.go index 6fed12d741..c36bfda968 100644 --- a/vendor/github.com/containers/common/libimage/manifest_list.go +++ b/vendor/github.com/containers/common/libimage/manifest_list.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libimage import ( diff --git a/vendor/github.com/containers/common/libimage/normalize.go b/vendor/github.com/containers/common/libimage/normalize.go index 9619b1a0d1..2b3402861d 100644 --- a/vendor/github.com/containers/common/libimage/normalize.go +++ b/vendor/github.com/containers/common/libimage/normalize.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libimage import ( diff --git a/vendor/github.com/containers/common/libimage/oci.go b/vendor/github.com/containers/common/libimage/oci.go index b88d6613d7..fcbd10ada5 100644 --- a/vendor/github.com/containers/common/libimage/oci.go +++ b/vendor/github.com/containers/common/libimage/oci.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libimage import ( diff --git a/vendor/github.com/containers/common/libimage/platform.go b/vendor/github.com/containers/common/libimage/platform.go index fc0e002fab..c378bc27ff 100644 --- a/vendor/github.com/containers/common/libimage/platform.go +++ b/vendor/github.com/containers/common/libimage/platform.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libimage import ( diff --git a/vendor/github.com/containers/common/libimage/pull.go b/vendor/github.com/containers/common/libimage/pull.go index 579eae2c0b..bc8e849816 100644 --- a/vendor/github.com/containers/common/libimage/pull.go +++ b/vendor/github.com/containers/common/libimage/pull.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libimage import ( diff --git a/vendor/github.com/containers/common/libimage/push.go b/vendor/github.com/containers/common/libimage/push.go index 7203838aa6..ed1d90c14b 100644 --- a/vendor/github.com/containers/common/libimage/push.go +++ b/vendor/github.com/containers/common/libimage/push.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libimage import ( diff --git a/vendor/github.com/containers/common/libimage/runtime.go b/vendor/github.com/containers/common/libimage/runtime.go index 33f515e99d..1948fe0ad8 100644 --- a/vendor/github.com/containers/common/libimage/runtime.go +++ b/vendor/github.com/containers/common/libimage/runtime.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libimage import ( diff --git a/vendor/github.com/containers/common/libimage/save.go b/vendor/github.com/containers/common/libimage/save.go index a42bbb4973..47a3a566bd 100644 --- a/vendor/github.com/containers/common/libimage/save.go +++ b/vendor/github.com/containers/common/libimage/save.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libimage import ( diff --git a/vendor/github.com/containers/common/libimage/search.go b/vendor/github.com/containers/common/libimage/search.go index 618850e6e1..9ef0e8320f 100644 --- a/vendor/github.com/containers/common/libimage/search.go +++ b/vendor/github.com/containers/common/libimage/search.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libimage import ( diff --git a/vendor/modules.txt b/vendor/modules.txt index 96aa592b5e..323dbb8c4d 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -167,7 +167,7 @@ github.com/containers/buildah/pkg/sshagent github.com/containers/buildah/pkg/util github.com/containers/buildah/pkg/volumes github.com/containers/buildah/util -# github.com/containers/common v0.56.1-0.20231023085521-d3170cb89b07 +# github.com/containers/common v0.56.1-0.20231023143107-8d0bd259cb7c ## explicit; go 1.18 github.com/containers/common/libimage github.com/containers/common/libimage/define From abb5c86b627a491e4e26d7ad37d9c0da6818b8f7 Mon Sep 17 00:00:00 2001 From: Paul Holzinger Date: Tue, 24 Oct 2023 12:11:10 +0200 Subject: [PATCH 03/10] pkg/autoupdate: add !remote tag Signed-off-by: Paul Holzinger --- pkg/autoupdate/autoupdate.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkg/autoupdate/autoupdate.go b/pkg/autoupdate/autoupdate.go index dd8c7b80c6..b979b92e1a 100644 --- a/pkg/autoupdate/autoupdate.go +++ b/pkg/autoupdate/autoupdate.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package autoupdate import ( From bad25da92e14cf36377b26a7a72c81ccd5122e0d Mon Sep 17 00:00:00 2001 From: Paul Holzinger Date: Tue, 24 Oct 2023 12:11:34 +0200 Subject: [PATCH 04/10] libpod: add !remote tag This should never be pulled into the remote client. Signed-off-by: Paul Holzinger --- libpod/boltdb_state.go | 3 +++ libpod/boltdb_state_internal.go | 3 +++ libpod/common_test.go | 3 +++ libpod/container.go | 3 +++ libpod/container_api.go | 3 +++ libpod/container_commit.go | 3 +++ libpod/container_config.go | 3 +++ libpod/container_copy_common.go | 3 ++- libpod/container_copy_freebsd.go | 3 +++ libpod/container_copy_linux.go | 3 +++ libpod/container_exec.go | 3 +++ libpod/container_freebsd.go | 4 ++-- libpod/container_graph.go | 3 +++ libpod/container_graph_test.go | 3 +++ libpod/container_inspect.go | 3 +++ libpod/container_inspect_freebsd.go | 3 +++ libpod/container_inspect_linux.go | 3 +++ libpod/container_internal.go | 3 +++ libpod/container_internal_common.go | 3 ++- libpod/container_internal_freebsd.go | 4 ++-- libpod/container_internal_linux.go | 4 ++-- libpod/container_internal_linux_test.go | 4 ++-- libpod/container_internal_test.go | 3 +++ libpod/container_linux.go | 4 ++-- libpod/container_log.go | 3 +++ libpod/container_log_linux.go | 4 ++-- libpod/container_log_unsupported.go | 3 ++- libpod/container_path_resolution.go | 3 +++ libpod/container_path_resolution_test.go | 3 +++ libpod/container_stat_common.go | 3 ++- libpod/container_stat_freebsd.go | 3 +++ libpod/container_stat_linux.go | 3 +++ libpod/container_top_freebsd.go | 4 ++-- libpod/container_top_linux.c | 3 +++ libpod/container_top_linux.go | 4 ++-- libpod/container_top_unsupported.go | 3 ++- libpod/container_validate.go | 3 +++ libpod/diff.go | 3 +++ libpod/events.go | 3 +++ libpod/healthcheck.go | 3 +++ libpod/healthcheck_linux.go | 4 ++-- libpod/healthcheck_nosystemd_linux.go | 4 ++-- libpod/healthcheck_unsupported.go | 4 ++-- libpod/info.go | 3 +++ libpod/info_freebsd.go | 3 +++ libpod/info_linux.go | 3 +++ libpod/info_test.go | 4 ++-- libpod/kube.go | 3 +++ libpod/mounts_linux.go | 4 ++-- libpod/networking_common.go | 3 ++- libpod/networking_freebsd.go | 4 ++-- libpod/networking_linux.go | 4 ++-- libpod/networking_linux_test.go | 3 +++ libpod/networking_machine.go | 3 +++ libpod/networking_pasta_linux.go | 3 +++ libpod/networking_slirp4netns.go | 4 ++-- libpod/oci.go | 3 +++ libpod/oci_conmon.go | 3 +++ libpod/oci_conmon_attach_common.go | 3 ++- libpod/oci_conmon_attach_freebsd.go | 3 +++ libpod/oci_conmon_attach_linux.go | 3 +++ libpod/oci_conmon_common.go | 3 ++- libpod/oci_conmon_exec_common.go | 4 ++++ libpod/oci_conmon_exec_freebsd.go | 3 +++ libpod/oci_conmon_exec_linux.go | 3 +++ libpod/oci_conmon_freebsd.go | 3 +++ libpod/oci_conmon_linux.go | 3 +++ libpod/oci_missing.go | 3 +++ libpod/oci_util.go | 3 +++ libpod/options.go | 3 +++ libpod/pod.go | 3 +++ libpod/pod_api.go | 3 +++ libpod/pod_internal.go | 3 +++ libpod/pod_internal_freebsd.go | 3 +++ libpod/pod_internal_linux.go | 3 +++ libpod/pod_status.go | 3 +++ libpod/pod_top_freebsd.go | 4 ++-- libpod/pod_top_linux.go | 4 ++-- libpod/reset.go | 3 +++ libpod/rlimit_int64.go | 4 ++-- libpod/rlimit_uint64.go | 4 ++-- libpod/runtime.go | 3 +++ libpod/runtime_cstorage.go | 3 +++ libpod/runtime_ctr.go | 3 +++ libpod/runtime_ctr_freebsd.go | 3 +++ libpod/runtime_ctr_linux.go | 3 +++ libpod/runtime_img.go | 3 +++ libpod/{runtime_migrate.go => runtime_migrate_linux.go} | 4 ++-- libpod/runtime_migrate_unsupported.go | 4 ++-- libpod/runtime_pod.go | 3 +++ libpod/runtime_pod_common.go | 3 ++- libpod/runtime_pod_freebsd.go | 3 +++ libpod/runtime_pod_linux.go | 3 +++ libpod/runtime_pre_go1.20.go | 4 ++-- libpod/runtime_renumber.go | 3 +++ libpod/runtime_test.go | 3 +++ libpod/runtime_volume.go | 3 +++ libpod/runtime_volume_common.go | 3 ++- libpod/runtime_worker.go | 3 +++ libpod/service.go | 3 +++ libpod/sqlite_state.go | 3 +++ libpod/sqlite_state_internal.go | 3 +++ libpod/state.go | 3 +++ libpod/state_test.go | 3 +++ libpod/stats_common.go | 3 ++- libpod/stats_freebsd.go | 3 +++ libpod/stats_linux.go | 4 ++-- libpod/storage.go | 3 +++ libpod/util.go | 3 +++ libpod/util_freebsd.go | 4 ++-- libpod/util_linux.go | 4 ++-- libpod/util_linux_test.go | 3 +++ libpod/util_test.go | 3 +++ libpod/volume.go | 3 +++ libpod/volume_inspect.go | 3 +++ libpod/volume_internal.go | 3 +++ libpod/volume_internal_common.go | 3 ++- libpod/volume_internal_freebsd.go | 3 +++ libpod/volume_internal_linux.go | 3 +++ 119 files changed, 320 insertions(+), 64 deletions(-) rename libpod/{runtime_migrate.go => runtime_migrate_linux.go} (98%) diff --git a/libpod/boltdb_state.go b/libpod/boltdb_state.go index f1888b6a18..a2740b289f 100644 --- a/libpod/boltdb_state.go +++ b/libpod/boltdb_state.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/boltdb_state_internal.go b/libpod/boltdb_state_internal.go index 90420cc687..388110f251 100644 --- a/libpod/boltdb_state_internal.go +++ b/libpod/boltdb_state_internal.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/common_test.go b/libpod/common_test.go index 61bba031e6..ed6577f9f0 100644 --- a/libpod/common_test.go +++ b/libpod/common_test.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/container.go b/libpod/container.go index 7c54a1519b..ddb2c1b105 100644 --- a/libpod/container.go +++ b/libpod/container.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/container_api.go b/libpod/container_api.go index 337ff7c39d..b0e06566df 100644 --- a/libpod/container_api.go +++ b/libpod/container_api.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/container_commit.go b/libpod/container_commit.go index d4db1e447b..00063c2c28 100644 --- a/libpod/container_commit.go +++ b/libpod/container_commit.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/container_config.go b/libpod/container_config.go index e0ab5c5e97..aefce67219 100644 --- a/libpod/container_config.go +++ b/libpod/container_config.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/container_copy_common.go b/libpod/container_copy_common.go index d07b4c6928..c8156a6302 100644 --- a/libpod/container_copy_common.go +++ b/libpod/container_copy_common.go @@ -1,4 +1,5 @@ -//go:build linux || freebsd +//go:build !remote && (linux || freebsd) +// +build !remote // +build linux freebsd package libpod diff --git a/libpod/container_copy_freebsd.go b/libpod/container_copy_freebsd.go index 218f3917f7..d19acc23a6 100644 --- a/libpod/container_copy_freebsd.go +++ b/libpod/container_copy_freebsd.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod // On FreeBSD, the container's mounts are in the global mount diff --git a/libpod/container_copy_linux.go b/libpod/container_copy_linux.go index 3b029f08f6..9096be810f 100644 --- a/libpod/container_copy_linux.go +++ b/libpod/container_copy_linux.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/container_exec.go b/libpod/container_exec.go index c7b1a93338..df52993c19 100644 --- a/libpod/container_exec.go +++ b/libpod/container_exec.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/container_freebsd.go b/libpod/container_freebsd.go index cb0a465b23..7164eefd86 100644 --- a/libpod/container_freebsd.go +++ b/libpod/container_freebsd.go @@ -1,5 +1,5 @@ -//go:build freebsd -// +build freebsd +//go:build !remote +// +build !remote package libpod diff --git a/libpod/container_graph.go b/libpod/container_graph.go index b508c66b86..6fae1c29a0 100644 --- a/libpod/container_graph.go +++ b/libpod/container_graph.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/container_graph_test.go b/libpod/container_graph_test.go index 7a265ecae3..665f055275 100644 --- a/libpod/container_graph_test.go +++ b/libpod/container_graph_test.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/container_inspect.go b/libpod/container_inspect.go index bb6fc7f543..d968fa00b1 100644 --- a/libpod/container_inspect.go +++ b/libpod/container_inspect.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/container_inspect_freebsd.go b/libpod/container_inspect_freebsd.go index 8b4e8df871..b0f8bae544 100644 --- a/libpod/container_inspect_freebsd.go +++ b/libpod/container_inspect_freebsd.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/container_inspect_linux.go b/libpod/container_inspect_linux.go index 53fb04034b..b0f11ea6f2 100644 --- a/libpod/container_inspect_linux.go +++ b/libpod/container_inspect_linux.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/container_internal.go b/libpod/container_internal.go index d6079df00a..00510d88ab 100644 --- a/libpod/container_internal.go +++ b/libpod/container_internal.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/container_internal_common.go b/libpod/container_internal_common.go index 15485efa40..b702a86b2e 100644 --- a/libpod/container_internal_common.go +++ b/libpod/container_internal_common.go @@ -1,4 +1,5 @@ -//go:build linux || freebsd +//go:build !remote && (linux || freebsd) +// +build !remote // +build linux freebsd package libpod diff --git a/libpod/container_internal_freebsd.go b/libpod/container_internal_freebsd.go index fe3d238d75..f4a3b9a855 100644 --- a/libpod/container_internal_freebsd.go +++ b/libpod/container_internal_freebsd.go @@ -1,5 +1,5 @@ -//go:build freebsd -// +build freebsd +//go:build !remote +// +build !remote package libpod diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go index 2a9bb9f86a..f96d1a8d9e 100644 --- a/libpod/container_internal_linux.go +++ b/libpod/container_internal_linux.go @@ -1,5 +1,5 @@ -//go:build linux -// +build linux +//go:build !remote +// +build !remote package libpod diff --git a/libpod/container_internal_linux_test.go b/libpod/container_internal_linux_test.go index 4054232f31..850ad57e6a 100644 --- a/libpod/container_internal_linux_test.go +++ b/libpod/container_internal_linux_test.go @@ -1,5 +1,5 @@ -//go:build linux -// +build linux +//go:build !remote +// +build !remote package libpod diff --git a/libpod/container_internal_test.go b/libpod/container_internal_test.go index 4fb95e95e4..9f6b504cdc 100644 --- a/libpod/container_internal_test.go +++ b/libpod/container_internal_test.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/container_linux.go b/libpod/container_linux.go index a1a64f5dda..8ff47f461f 100644 --- a/libpod/container_linux.go +++ b/libpod/container_linux.go @@ -1,5 +1,5 @@ -//go:build linux -// +build linux +//go:build !remote +// +build !remote package libpod diff --git a/libpod/container_log.go b/libpod/container_log.go index 5d399b7129..55043456ff 100644 --- a/libpod/container_log.go +++ b/libpod/container_log.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/container_log_linux.go b/libpod/container_log_linux.go index a708ad46da..c3564fbf27 100644 --- a/libpod/container_log_linux.go +++ b/libpod/container_log_linux.go @@ -1,5 +1,5 @@ -//go:build linux && systemd -// +build linux,systemd +//go:build !remote && linux && systemd +// +build !remote,linux,systemd package libpod diff --git a/libpod/container_log_unsupported.go b/libpod/container_log_unsupported.go index d524561f42..6f89f4612d 100644 --- a/libpod/container_log_unsupported.go +++ b/libpod/container_log_unsupported.go @@ -1,4 +1,5 @@ -//go:build !linux || !systemd +//go:build !remote && (!linux || !systemd) +// +build !remote // +build !linux !systemd package libpod diff --git a/libpod/container_path_resolution.go b/libpod/container_path_resolution.go index af9c3277e6..4148379977 100644 --- a/libpod/container_path_resolution.go +++ b/libpod/container_path_resolution.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/container_path_resolution_test.go b/libpod/container_path_resolution_test.go index f906c752d2..38e60ed603 100644 --- a/libpod/container_path_resolution_test.go +++ b/libpod/container_path_resolution_test.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/container_stat_common.go b/libpod/container_stat_common.go index c70098cf51..b2e7eacd79 100644 --- a/libpod/container_stat_common.go +++ b/libpod/container_stat_common.go @@ -1,4 +1,5 @@ -//go:build linux || freebsd +//go:build !remote && (linux || freebsd) +// +build !remote // +build linux freebsd package libpod diff --git a/libpod/container_stat_freebsd.go b/libpod/container_stat_freebsd.go index d1e0db3482..24288d7984 100644 --- a/libpod/container_stat_freebsd.go +++ b/libpod/container_stat_freebsd.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/container_stat_linux.go b/libpod/container_stat_linux.go index 5e5ef3c1af..ef0e88c322 100644 --- a/libpod/container_stat_linux.go +++ b/libpod/container_stat_linux.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/container_top_freebsd.go b/libpod/container_top_freebsd.go index 0ca26fab40..801814bb60 100644 --- a/libpod/container_top_freebsd.go +++ b/libpod/container_top_freebsd.go @@ -1,5 +1,5 @@ -//go:build freebsd -// +build freebsd +//go:build !remote +// +build !remote package libpod diff --git a/libpod/container_top_linux.c b/libpod/container_top_linux.c index 566425b6fa..735becc640 100644 --- a/libpod/container_top_linux.c +++ b/libpod/container_top_linux.c @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + #define _GNU_SOURCE #include #include diff --git a/libpod/container_top_linux.go b/libpod/container_top_linux.go index 41002eb527..85cec315e7 100644 --- a/libpod/container_top_linux.go +++ b/libpod/container_top_linux.go @@ -1,5 +1,5 @@ -//go:build linux && cgo -// +build linux,cgo +//go:build !remote && linux && cgo +// +build !remote,linux,cgo package libpod diff --git a/libpod/container_top_unsupported.go b/libpod/container_top_unsupported.go index 3d7d7e3192..66fd66887a 100644 --- a/libpod/container_top_unsupported.go +++ b/libpod/container_top_unsupported.go @@ -1,4 +1,5 @@ -//go:build !(linux && cgo) && !freebsd +//go:build !remote && !(linux && cgo) && !freebsd +// +build !remote // +build !linux !cgo // +build !freebsd diff --git a/libpod/container_validate.go b/libpod/container_validate.go index caa633d432..e01d8ef098 100644 --- a/libpod/container_validate.go +++ b/libpod/container_validate.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/diff.go b/libpod/diff.go index 8f0ad93555..906329d78a 100644 --- a/libpod/diff.go +++ b/libpod/diff.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/events.go b/libpod/events.go index 7d148b86dd..6e8c409e3a 100644 --- a/libpod/events.go +++ b/libpod/events.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/healthcheck.go b/libpod/healthcheck.go index d069e171a2..f906562bc9 100644 --- a/libpod/healthcheck.go +++ b/libpod/healthcheck.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/healthcheck_linux.go b/libpod/healthcheck_linux.go index 04268e5eec..53ec0c1dee 100644 --- a/libpod/healthcheck_linux.go +++ b/libpod/healthcheck_linux.go @@ -1,5 +1,5 @@ -//go:build systemd -// +build systemd +//go:build !remote && systemd +// +build !remote,systemd package libpod diff --git a/libpod/healthcheck_nosystemd_linux.go b/libpod/healthcheck_nosystemd_linux.go index 2e3b15dcff..cde5f0c10f 100644 --- a/libpod/healthcheck_nosystemd_linux.go +++ b/libpod/healthcheck_nosystemd_linux.go @@ -1,5 +1,5 @@ -//go:build !systemd -// +build !systemd +//go:build !remote && !systemd +// +build !remote,!systemd package libpod diff --git a/libpod/healthcheck_unsupported.go b/libpod/healthcheck_unsupported.go index c6ba52ea7d..5e2c151f42 100644 --- a/libpod/healthcheck_unsupported.go +++ b/libpod/healthcheck_unsupported.go @@ -1,5 +1,5 @@ -//go:build !linux -// +build !linux +//go:build !remote && !linux +// +build !remote,!linux package libpod diff --git a/libpod/info.go b/libpod/info.go index 82e9ab8a5a..b91f8780b2 100644 --- a/libpod/info.go +++ b/libpod/info.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/info_freebsd.go b/libpod/info_freebsd.go index 1be988350c..19b4257e37 100644 --- a/libpod/info_freebsd.go +++ b/libpod/info_freebsd.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/info_linux.go b/libpod/info_linux.go index 55ca37d30f..4ede6a050c 100644 --- a/libpod/info_linux.go +++ b/libpod/info_linux.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/info_test.go b/libpod/info_test.go index 1fe49c175a..c8c217a3f1 100644 --- a/libpod/info_test.go +++ b/libpod/info_test.go @@ -1,5 +1,5 @@ -//go:build linux -// +build linux +//go:build !remote && linux +// +build !remote,linux package libpod diff --git a/libpod/kube.go b/libpod/kube.go index 48b536071d..6338e14c4d 100644 --- a/libpod/kube.go +++ b/libpod/kube.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/mounts_linux.go b/libpod/mounts_linux.go index f6945b3a36..a30136f8a3 100644 --- a/libpod/mounts_linux.go +++ b/libpod/mounts_linux.go @@ -1,5 +1,5 @@ -//go:build linux -// +build linux +//go:build !remote +// +build !remote package libpod diff --git a/libpod/networking_common.go b/libpod/networking_common.go index c6f4390c44..d7bd84fe0a 100644 --- a/libpod/networking_common.go +++ b/libpod/networking_common.go @@ -1,4 +1,5 @@ -//go:build linux || freebsd +//go:build !remote && (linux || freebsd) +// +build !remote // +build linux freebsd package libpod diff --git a/libpod/networking_freebsd.go b/libpod/networking_freebsd.go index bf817a75f1..75cb4fc80d 100644 --- a/libpod/networking_freebsd.go +++ b/libpod/networking_freebsd.go @@ -1,5 +1,5 @@ -//go:build freebsd -// +build freebsd +//go:build !remote +// +build !remote package libpod diff --git a/libpod/networking_linux.go b/libpod/networking_linux.go index d2c9def0e5..601d9a49bf 100644 --- a/libpod/networking_linux.go +++ b/libpod/networking_linux.go @@ -1,5 +1,5 @@ -//go:build linux -// +build linux +//go:build !remote +// +build !remote package libpod diff --git a/libpod/networking_linux_test.go b/libpod/networking_linux_test.go index 2aeb1a02c5..9f751ab7e3 100644 --- a/libpod/networking_linux_test.go +++ b/libpod/networking_linux_test.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/networking_machine.go b/libpod/networking_machine.go index dce335c0a7..5fb8986a31 100644 --- a/libpod/networking_machine.go +++ b/libpod/networking_machine.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/networking_pasta_linux.go b/libpod/networking_pasta_linux.go index 288335ce94..905810a0f7 100644 --- a/libpod/networking_pasta_linux.go +++ b/libpod/networking_pasta_linux.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + // SPDX-License-Identifier: Apache-2.0 // // networking_pasta_linux.go - Start pasta(1) for user-mode connectivity diff --git a/libpod/networking_slirp4netns.go b/libpod/networking_slirp4netns.go index 664b73d391..e8eaa76820 100644 --- a/libpod/networking_slirp4netns.go +++ b/libpod/networking_slirp4netns.go @@ -1,5 +1,5 @@ -//go:build linux -// +build linux +//go:build !remote && linux +// +build !remote,linux package libpod diff --git a/libpod/oci.go b/libpod/oci.go index 30fb43b905..8b55e58adc 100644 --- a/libpod/oci.go +++ b/libpod/oci.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/oci_conmon.go b/libpod/oci_conmon.go index 74060b3579..a31df444ae 100644 --- a/libpod/oci_conmon.go +++ b/libpod/oci_conmon.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod const ( diff --git a/libpod/oci_conmon_attach_common.go b/libpod/oci_conmon_attach_common.go index 39ad274958..396e079dd6 100644 --- a/libpod/oci_conmon_attach_common.go +++ b/libpod/oci_conmon_attach_common.go @@ -1,4 +1,5 @@ -//go:build linux || freebsd +//go:build !remote && (linux || freebsd) +// +build !remote // +build linux freebsd package libpod diff --git a/libpod/oci_conmon_attach_freebsd.go b/libpod/oci_conmon_attach_freebsd.go index de00543814..38ea56662d 100644 --- a/libpod/oci_conmon_attach_freebsd.go +++ b/libpod/oci_conmon_attach_freebsd.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/oci_conmon_attach_linux.go b/libpod/oci_conmon_attach_linux.go index f1aa89d3e9..242cd46722 100644 --- a/libpod/oci_conmon_attach_linux.go +++ b/libpod/oci_conmon_attach_linux.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/oci_conmon_common.go b/libpod/oci_conmon_common.go index c02b3bf6e9..557eb878de 100644 --- a/libpod/oci_conmon_common.go +++ b/libpod/oci_conmon_common.go @@ -1,4 +1,5 @@ -//go:build linux || freebsd +//go:build !remote && (linux || freebsd) +// +build !remote // +build linux freebsd package libpod diff --git a/libpod/oci_conmon_exec_common.go b/libpod/oci_conmon_exec_common.go index 88e24233bd..b44dbe0efa 100644 --- a/libpod/oci_conmon_exec_common.go +++ b/libpod/oci_conmon_exec_common.go @@ -1,3 +1,7 @@ +//go:build !remote && (linux || freebsd) +// +build !remote +// +build linux freebsd + package libpod import ( diff --git a/libpod/oci_conmon_exec_freebsd.go b/libpod/oci_conmon_exec_freebsd.go index bf30404a19..baf3ac4e44 100644 --- a/libpod/oci_conmon_exec_freebsd.go +++ b/libpod/oci_conmon_exec_freebsd.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/oci_conmon_exec_linux.go b/libpod/oci_conmon_exec_linux.go index 617e8d6015..8ef0d996c3 100644 --- a/libpod/oci_conmon_exec_linux.go +++ b/libpod/oci_conmon_exec_linux.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/oci_conmon_freebsd.go b/libpod/oci_conmon_freebsd.go index d74f2af015..e8cf6085a0 100644 --- a/libpod/oci_conmon_freebsd.go +++ b/libpod/oci_conmon_freebsd.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/oci_conmon_linux.go b/libpod/oci_conmon_linux.go index a3a552bc64..527dea8370 100644 --- a/libpod/oci_conmon_linux.go +++ b/libpod/oci_conmon_linux.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/oci_missing.go b/libpod/oci_missing.go index bbf2957ff7..eedb5c6c6c 100644 --- a/libpod/oci_missing.go +++ b/libpod/oci_missing.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/oci_util.go b/libpod/oci_util.go index e118348fa3..981174561d 100644 --- a/libpod/oci_util.go +++ b/libpod/oci_util.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/options.go b/libpod/options.go index cd5af912a0..ffead43b4e 100644 --- a/libpod/options.go +++ b/libpod/options.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/pod.go b/libpod/pod.go index 0d4a591c2f..c83dba75ae 100644 --- a/libpod/pod.go +++ b/libpod/pod.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/pod_api.go b/libpod/pod_api.go index 8c6e4cb6b4..c5bab8c2d7 100644 --- a/libpod/pod_api.go +++ b/libpod/pod_api.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/pod_internal.go b/libpod/pod_internal.go index 50ef1f6d4a..7554705d24 100644 --- a/libpod/pod_internal.go +++ b/libpod/pod_internal.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/pod_internal_freebsd.go b/libpod/pod_internal_freebsd.go index 48f6e2bcf8..d8c1111d91 100644 --- a/libpod/pod_internal_freebsd.go +++ b/libpod/pod_internal_freebsd.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod func (p *Pod) platformRefresh() error { diff --git a/libpod/pod_internal_linux.go b/libpod/pod_internal_linux.go index ef7fefa41b..e8710d5b1b 100644 --- a/libpod/pod_internal_linux.go +++ b/libpod/pod_internal_linux.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/pod_status.go b/libpod/pod_status.go index aabdfe50ef..1b4767b25b 100644 --- a/libpod/pod_status.go +++ b/libpod/pod_status.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import "github.com/containers/podman/v4/libpod/define" diff --git a/libpod/pod_top_freebsd.go b/libpod/pod_top_freebsd.go index da7935bd56..902e369a7e 100644 --- a/libpod/pod_top_freebsd.go +++ b/libpod/pod_top_freebsd.go @@ -1,5 +1,5 @@ -//go:build freebsd -// +build freebsd +//go:build !remote +// +build !remote package libpod diff --git a/libpod/pod_top_linux.go b/libpod/pod_top_linux.go index 544126dcda..a800494182 100644 --- a/libpod/pod_top_linux.go +++ b/libpod/pod_top_linux.go @@ -1,5 +1,5 @@ -//go:build linux -// +build linux +//go:build !remote +// +build !remote package libpod diff --git a/libpod/reset.go b/libpod/reset.go index 6ed38df1d8..8833eb94b2 100644 --- a/libpod/reset.go +++ b/libpod/reset.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/rlimit_int64.go b/libpod/rlimit_int64.go index bff3e76f98..23dbc50662 100644 --- a/libpod/rlimit_int64.go +++ b/libpod/rlimit_int64.go @@ -1,5 +1,5 @@ -//go:build freebsd -// +build freebsd +//go:build !remote && freebsd +// +build !remote,freebsd package libpod diff --git a/libpod/rlimit_uint64.go b/libpod/rlimit_uint64.go index ab2e5d2d02..d446b46510 100644 --- a/libpod/rlimit_uint64.go +++ b/libpod/rlimit_uint64.go @@ -1,5 +1,5 @@ -//go:build linux || darwin -// +build linux darwin +//go:build !remote && linux +// +build !remote,linux package libpod diff --git a/libpod/runtime.go b/libpod/runtime.go index 27e2e05dfe..8af1864843 100644 --- a/libpod/runtime.go +++ b/libpod/runtime.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/runtime_cstorage.go b/libpod/runtime_cstorage.go index 5917b79314..86b6d065d4 100644 --- a/libpod/runtime_cstorage.go +++ b/libpod/runtime_cstorage.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go index 909d6d0ff7..9b13de5af5 100644 --- a/libpod/runtime_ctr.go +++ b/libpod/runtime_ctr.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/runtime_ctr_freebsd.go b/libpod/runtime_ctr_freebsd.go index a8870a38c6..0f6f1b0256 100644 --- a/libpod/runtime_ctr_freebsd.go +++ b/libpod/runtime_ctr_freebsd.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod const ( diff --git a/libpod/runtime_ctr_linux.go b/libpod/runtime_ctr_linux.go index 7812d8238e..09082febad 100644 --- a/libpod/runtime_ctr_linux.go +++ b/libpod/runtime_ctr_linux.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod const ( diff --git a/libpod/runtime_img.go b/libpod/runtime_img.go index c1bec6d22b..c07e8cbaa7 100644 --- a/libpod/runtime_img.go +++ b/libpod/runtime_img.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/runtime_migrate.go b/libpod/runtime_migrate_linux.go similarity index 98% rename from libpod/runtime_migrate.go rename to libpod/runtime_migrate_linux.go index 4764271845..717b123baa 100644 --- a/libpod/runtime_migrate.go +++ b/libpod/runtime_migrate_linux.go @@ -1,5 +1,5 @@ -//go:build linux -// +build linux +//go:build !remote +// +build !remote package libpod diff --git a/libpod/runtime_migrate_unsupported.go b/libpod/runtime_migrate_unsupported.go index 77c2737a9b..0a1b0b9fdc 100644 --- a/libpod/runtime_migrate_unsupported.go +++ b/libpod/runtime_migrate_unsupported.go @@ -1,5 +1,5 @@ -//go:build !linux -// +build !linux +//go:build !remote && !linux +// +build !remote,!linux package libpod diff --git a/libpod/runtime_pod.go b/libpod/runtime_pod.go index de840afeb0..3fe88268de 100644 --- a/libpod/runtime_pod.go +++ b/libpod/runtime_pod.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/runtime_pod_common.go b/libpod/runtime_pod_common.go index a4cc0f6bdf..5d6f95dab4 100644 --- a/libpod/runtime_pod_common.go +++ b/libpod/runtime_pod_common.go @@ -1,4 +1,5 @@ -//go:build linux || freebsd +//go:build !remote && (linux || freebsd) +// +build !remote // +build linux freebsd package libpod diff --git a/libpod/runtime_pod_freebsd.go b/libpod/runtime_pod_freebsd.go index 7ec9bf026a..58647250f3 100644 --- a/libpod/runtime_pod_freebsd.go +++ b/libpod/runtime_pod_freebsd.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/runtime_pod_linux.go b/libpod/runtime_pod_linux.go index 9d4a8641a3..010a27c3aa 100644 --- a/libpod/runtime_pod_linux.go +++ b/libpod/runtime_pod_linux.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/runtime_pre_go1.20.go b/libpod/runtime_pre_go1.20.go index 1c73043de4..3dcbe1808a 100644 --- a/libpod/runtime_pre_go1.20.go +++ b/libpod/runtime_pre_go1.20.go @@ -1,7 +1,7 @@ // In go 1.20 and later, the global RNG is automatically initialized. // Ref: https://pkg.go.dev/math/rand@go1.20#Seed -//go:build !go1.20 -// +build !go1.20 +//go:build !go1.20 && !remote +// +build !go1.20,!remote package libpod diff --git a/libpod/runtime_renumber.go b/libpod/runtime_renumber.go index f75e0e3e04..d4eaddaf25 100644 --- a/libpod/runtime_renumber.go +++ b/libpod/runtime_renumber.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/runtime_test.go b/libpod/runtime_test.go index 7468d34938..3e21f10484 100644 --- a/libpod/runtime_test.go +++ b/libpod/runtime_test.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/runtime_volume.go b/libpod/runtime_volume.go index 9efb30e037..292432b7bb 100644 --- a/libpod/runtime_volume.go +++ b/libpod/runtime_volume.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/runtime_volume_common.go b/libpod/runtime_volume_common.go index c74a0f32a3..1be52b2294 100644 --- a/libpod/runtime_volume_common.go +++ b/libpod/runtime_volume_common.go @@ -1,4 +1,5 @@ -//go:build linux || freebsd +//go:build !remote && (linux || freebsd) +// +build !remote // +build linux freebsd package libpod diff --git a/libpod/runtime_worker.go b/libpod/runtime_worker.go index 9d41321b28..0851d74a91 100644 --- a/libpod/runtime_worker.go +++ b/libpod/runtime_worker.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod func (r *Runtime) startWorker() { diff --git a/libpod/service.go b/libpod/service.go index a4b66eae9f..fdc5f048e8 100644 --- a/libpod/service.go +++ b/libpod/service.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/sqlite_state.go b/libpod/sqlite_state.go index 8643764a5d..9c88eb4e9c 100644 --- a/libpod/sqlite_state.go +++ b/libpod/sqlite_state.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/sqlite_state_internal.go b/libpod/sqlite_state_internal.go index 1aa39cbe1a..1f2c88dee7 100644 --- a/libpod/sqlite_state_internal.go +++ b/libpod/sqlite_state_internal.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/state.go b/libpod/state.go index 1e7a973834..b84ee06d53 100644 --- a/libpod/state.go +++ b/libpod/state.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import "github.com/containers/common/libnetwork/types" diff --git a/libpod/state_test.go b/libpod/state_test.go index 9baed3ebe0..b0558a4782 100644 --- a/libpod/state_test.go +++ b/libpod/state_test.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/stats_common.go b/libpod/stats_common.go index 402bff4336..280aa0606d 100644 --- a/libpod/stats_common.go +++ b/libpod/stats_common.go @@ -1,4 +1,5 @@ -//go:build linux || freebsd +//go:build !remote && (linux || freebsd) +// +build !remote // +build linux freebsd package libpod diff --git a/libpod/stats_freebsd.go b/libpod/stats_freebsd.go index 14f367d8a0..9e8a09aefd 100644 --- a/libpod/stats_freebsd.go +++ b/libpod/stats_freebsd.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/stats_linux.go b/libpod/stats_linux.go index 5d09c3524e..1254e4867d 100644 --- a/libpod/stats_linux.go +++ b/libpod/stats_linux.go @@ -1,5 +1,5 @@ -//go:build linux -// +build linux +//go:build !remote +// +build !remote package libpod diff --git a/libpod/storage.go b/libpod/storage.go index 3d5e7ddcc2..9d7bbafa3f 100644 --- a/libpod/storage.go +++ b/libpod/storage.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/util.go b/libpod/util.go index 4069e31cd0..ed7c1260f6 100644 --- a/libpod/util.go +++ b/libpod/util.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/util_freebsd.go b/libpod/util_freebsd.go index a6942fc9f2..20914b5316 100644 --- a/libpod/util_freebsd.go +++ b/libpod/util_freebsd.go @@ -1,5 +1,5 @@ -//go:build freebsd -// +build freebsd +//go:build !remote +// +build !remote package libpod diff --git a/libpod/util_linux.go b/libpod/util_linux.go index 7f6e1472c6..14a4ff119e 100644 --- a/libpod/util_linux.go +++ b/libpod/util_linux.go @@ -1,5 +1,5 @@ -//go:build linux -// +build linux +//go:build !remote +// +build !remote package libpod diff --git a/libpod/util_linux_test.go b/libpod/util_linux_test.go index 455fb84315..b8766983ef 100644 --- a/libpod/util_linux_test.go +++ b/libpod/util_linux_test.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/util_test.go b/libpod/util_test.go index dc3b8e6730..75ff1d5c8e 100644 --- a/libpod/util_test.go +++ b/libpod/util_test.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/volume.go b/libpod/volume.go index 9f08031548..0d8a179632 100644 --- a/libpod/volume.go +++ b/libpod/volume.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/volume_inspect.go b/libpod/volume_inspect.go index e2300da471..9916349140 100644 --- a/libpod/volume_inspect.go +++ b/libpod/volume_inspect.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/volume_internal.go b/libpod/volume_internal.go index 0daa24f826..7b86c22924 100644 --- a/libpod/volume_internal.go +++ b/libpod/volume_internal.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/volume_internal_common.go b/libpod/volume_internal_common.go index 199059cc4c..06c9dd53a1 100644 --- a/libpod/volume_internal_common.go +++ b/libpod/volume_internal_common.go @@ -1,4 +1,5 @@ -//go:build linux || freebsd +//go:build !remote && (linux || freebsd) +// +build !remote // +build linux freebsd package libpod diff --git a/libpod/volume_internal_freebsd.go b/libpod/volume_internal_freebsd.go index cf71f1e320..d0d9df77ed 100644 --- a/libpod/volume_internal_freebsd.go +++ b/libpod/volume_internal_freebsd.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( diff --git a/libpod/volume_internal_linux.go b/libpod/volume_internal_linux.go index eb4309dc31..e21fd97a38 100644 --- a/libpod/volume_internal_linux.go +++ b/libpod/volume_internal_linux.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package libpod import ( From 1d163099088b7cd60a6a8f7fa879ddc5f4724e76 Mon Sep 17 00:00:00 2001 From: Paul Holzinger Date: Tue, 24 Oct 2023 12:19:30 +0200 Subject: [PATCH 05/10] pkg/systemd/generate: add !remote tag Signed-off-by: Paul Holzinger --- pkg/systemd/generate/common.go | 3 +++ pkg/systemd/generate/common_test.go | 3 +++ pkg/systemd/generate/containers.go | 3 +++ pkg/systemd/generate/containers_test.go | 3 +++ pkg/systemd/generate/pods.go | 3 +++ pkg/systemd/generate/pods_test.go | 3 +++ 6 files changed, 18 insertions(+) diff --git a/pkg/systemd/generate/common.go b/pkg/systemd/generate/common.go index b0a441d54f..1ec0ca9fe7 100644 --- a/pkg/systemd/generate/common.go +++ b/pkg/systemd/generate/common.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package generate import ( diff --git a/pkg/systemd/generate/common_test.go b/pkg/systemd/generate/common_test.go index b9a43df8c3..cb513430d2 100644 --- a/pkg/systemd/generate/common_test.go +++ b/pkg/systemd/generate/common_test.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package generate import ( diff --git a/pkg/systemd/generate/containers.go b/pkg/systemd/generate/containers.go index fb4485735a..1230640f38 100644 --- a/pkg/systemd/generate/containers.go +++ b/pkg/systemd/generate/containers.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package generate import ( diff --git a/pkg/systemd/generate/containers_test.go b/pkg/systemd/generate/containers_test.go index cf520f746a..6bb9f3ca65 100644 --- a/pkg/systemd/generate/containers_test.go +++ b/pkg/systemd/generate/containers_test.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package generate import ( diff --git a/pkg/systemd/generate/pods.go b/pkg/systemd/generate/pods.go index 7433d9dbdb..cab7587794 100644 --- a/pkg/systemd/generate/pods.go +++ b/pkg/systemd/generate/pods.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package generate import ( diff --git a/pkg/systemd/generate/pods_test.go b/pkg/systemd/generate/pods_test.go index 3cde6eacb0..7fa802810d 100644 --- a/pkg/systemd/generate/pods_test.go +++ b/pkg/systemd/generate/pods_test.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package generate import ( From 9cecae8c2000fad22c820d6eb5ba3bbba81561b1 Mon Sep 17 00:00:00 2001 From: Paul Holzinger Date: Tue, 24 Oct 2023 12:21:31 +0200 Subject: [PATCH 06/10] pkg/ps: add !remote tag Signed-off-by: Paul Holzinger --- pkg/ps/ps.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkg/ps/ps.go b/pkg/ps/ps.go index c280aae06d..ac51c7cf90 100644 --- a/pkg/ps/ps.go +++ b/pkg/ps/ps.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package ps import ( From d4a67cf45c3c3ab649daae93f36149279129b661 Mon Sep 17 00:00:00 2001 From: Paul Holzinger Date: Tue, 24 Oct 2023 12:22:28 +0200 Subject: [PATCH 07/10] pkg/domain/filters: add !remote tag Signed-off-by: Paul Holzinger --- pkg/domain/filters/containers.go | 3 +++ pkg/domain/filters/pods.go | 3 +++ pkg/domain/filters/volumes.go | 3 +++ 3 files changed, 9 insertions(+) diff --git a/pkg/domain/filters/containers.go b/pkg/domain/filters/containers.go index 6c4aa49251..c252473376 100644 --- a/pkg/domain/filters/containers.go +++ b/pkg/domain/filters/containers.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package filters import ( diff --git a/pkg/domain/filters/pods.go b/pkg/domain/filters/pods.go index be7f6632d9..bf41b74acf 100644 --- a/pkg/domain/filters/pods.go +++ b/pkg/domain/filters/pods.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package filters import ( diff --git a/pkg/domain/filters/volumes.go b/pkg/domain/filters/volumes.go index 4c534e44cf..cff7aa9792 100644 --- a/pkg/domain/filters/volumes.go +++ b/pkg/domain/filters/volumes.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package filters import ( From cb9dfeb8ec8027352a0ef62f4b7af25fc794f64f Mon Sep 17 00:00:00 2001 From: Paul Holzinger Date: Tue, 24 Oct 2023 12:23:17 +0200 Subject: [PATCH 08/10] pkg/parallel/ctr: add !remote tag Signed-off-by: Paul Holzinger --- pkg/parallel/ctr/ctr.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkg/parallel/ctr/ctr.go b/pkg/parallel/ctr/ctr.go index ca47a0ee44..8e73aa5adc 100644 --- a/pkg/parallel/ctr/ctr.go +++ b/pkg/parallel/ctr/ctr.go @@ -1,3 +1,6 @@ +//go:build !remote +// +build !remote + package ctr import ( From 8a0968baa292cc966ce28cae655b0ab5958c01dd Mon Sep 17 00:00:00 2001 From: Paul Holzinger Date: Tue, 24 Oct 2023 12:49:40 +0200 Subject: [PATCH 09/10] pkg/specgen: remove config_unsupported.go This is not used at all but causes a libimage import for non linux builds which causes bloat for them, with the new !remote tag this is no longer possible and we have to remove it to fix the build. Signed-off-by: Paul Holzinger --- pkg/specgen/config_unsupported.go | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 pkg/specgen/config_unsupported.go diff --git a/pkg/specgen/config_unsupported.go b/pkg/specgen/config_unsupported.go deleted file mode 100644 index becfd2eafd..0000000000 --- a/pkg/specgen/config_unsupported.go +++ /dev/null @@ -1,15 +0,0 @@ -//go:build !linux -// +build !linux - -package specgen - -import ( - "errors" - - "github.com/containers/common/libimage" - spec "github.com/opencontainers/runtime-spec/specs-go" -) - -func (s *SpecGenerator) getSeccompConfig(configSpec *spec.Spec, img *libimage.Image) (*spec.LinuxSeccomp, error) { - return nil, errors.New("function not supported on non-linux OS's") -} From 1b466ccbdc988023abfef6aabe4d06951375c3da Mon Sep 17 00:00:00 2001 From: Paul Holzinger Date: Tue, 24 Oct 2023 13:52:15 +0200 Subject: [PATCH 10/10] test/e2e: do not import buildah We only care about the version so just import the define package for it, the main buildah package causes big transitive imports which fail to build with the remote tag (i.e. libimage) Signed-off-by: Paul Holzinger --- test/e2e/build_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/e2e/build_test.go b/test/e2e/build_test.go index faf49cb667..ab1b1d6b67 100644 --- a/test/e2e/build_test.go +++ b/test/e2e/build_test.go @@ -9,7 +9,7 @@ import ( "runtime" "strings" - "github.com/containers/buildah" + "github.com/containers/buildah/define" . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -344,7 +344,7 @@ RUN exit 5`, CITEST_IMAGE) inspect := podmanTest.Podman([]string{"image", "inspect", "--format", "{{ index .Config.Labels }}", "test"}) inspect.WaitWithDefaultTimeout() data := inspect.OutputToString() - Expect(data).To(ContainSubstring(buildah.Version)) + Expect(data).To(ContainSubstring(define.Version)) }) It("podman build and check identity with always", func() { @@ -357,7 +357,7 @@ RUN exit 5`, CITEST_IMAGE) inspect := podmanTest.Podman([]string{"image", "inspect", "--format", "{{ index .Config.Labels }}", "test1"}) inspect.WaitWithDefaultTimeout() data := inspect.OutputToString() - Expect(data).To(ContainSubstring(buildah.Version)) + Expect(data).To(ContainSubstring(define.Version)) // with --pull-always session = podmanTest.Podman([]string{"build", "-q", "--pull-always", "-f", "build/basicalpine/Containerfile.path", "--no-cache", "-t", "test2", "build/basicalpine"}) @@ -368,7 +368,7 @@ RUN exit 5`, CITEST_IMAGE) inspect = podmanTest.Podman([]string{"image", "inspect", "--format", "{{ index .Config.Labels }}", "test2"}) inspect.WaitWithDefaultTimeout() data = inspect.OutputToString() - Expect(data).To(ContainSubstring(buildah.Version)) + Expect(data).To(ContainSubstring(define.Version)) }) It("podman-remote send correct path to copier", func() {