Merge pull request #15425 from dfr/freebsd-boltdb

libpod: Add definition of containerPlatformState for FreeBSD

libpod/boltdb_state_freebsd.go

@@ -0,0 +1,17 @@
+//go:build freebsd
+// +build freebsd
+
+package libpod
+
+// replaceNetNS handle network namespace transitions after updating a
+// container's state.
+func replaceNetNS(netNSPath string, ctr *Container, newState *ContainerState) error {
+	// On FreeBSD, we just record the network jail's name in our state.
+	newState.NetworkJail = netNSPath
+	return nil
+}
+
+// getNetNSPath retrieves the netns path to be stored in the database
+func getNetNSPath(ctr *Container) string {
+	return ctr.state.NetworkJail
+}

libpod/boltdb_state_unsupported.go

@@ -1,5 +1,5 @@
-//go:build !linux
+//go:build !linux && !freebsd
-// +build !linux
+// +build !linux,!freebsd
 
 package libpod
 

libpod/container_freebsd.go

@@ -0,0 +1,12 @@
+//go:build freebsd
+// +build freebsd
+
+package libpod
+
+type containerPlatformState struct {
+	// NetworkJail is the name of the container's network VNET
+	// jail.  Will only be set if config.CreateNetNS is true, or
+	// the container was told to join another container's network
+	// namespace.
+	NetworkJail string `json:"-"`
+}

libpod/container_unsupported.go

@@ -1,5 +1,5 @@
-//go:build !linux
+//go:build !linux && !freebsd
-// +build !linux
+// +build !linux,!freebsd
 
 package libpod