Merge pull request #6320 from rhatdan/skip

Start testing with cross compilation

7 files changed, 11 insertions, 6 deletions

diff --git a/.cirrus.yml b/.cirrus.yml
index c7817cde8..c21bc74db 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -646,7 +646,6 @@ special_testing_in_podman_task:
 
 special_testing_cross_task:
 
-    skip: $CI == 'true'
     alias: "special_testing_cross"
     depends_on:
         - "gating"
diff --git a/cmd/podman/pods/create.go b/cmd/podman/pods/create.go
index 88b615fab..62b5b849e 100644
--- a/cmd/podman/pods/create.go
+++ b/cmd/podman/pods/create.go
@@ -13,7 +13,6 @@ import (
 	"github.com/containers/libpod/cmd/podman/validate"
 	"github.com/containers/libpod/pkg/domain/entities"
 	"github.com/containers/libpod/pkg/errorhandling"
-	createconfig "github.com/containers/libpod/pkg/spec"
 	"github.com/containers/libpod/pkg/specgen"
 	"github.com/containers/libpod/pkg/util"
 	"github.com/pkg/errors"
@@ -61,7 +60,7 @@ func init() {
 	flags.StringVarP(&createOptions.Name, "name", "n", "", "Assign a name to the pod")
 	flags.StringVarP(&createOptions.Hostname, "hostname", "", "", "Set a hostname to the pod")
 	flags.StringVar(&podIDFile, "pod-id-file", "", "Write the pod ID to the file")
-	flags.StringVar(&share, "share", createconfig.DefaultKernelNamespaces, "A comma delimited list of kernel namespaces the pod will share")
+	flags.StringVar(&share, "share", specgen.DefaultKernelNamespaces, "A comma delimited list of kernel namespaces the pod will share")
 	flags.SetNormalizeFunc(aliasNetworkFlag)
 }
 
diff --git a/cmd/podman/system/service.go b/cmd/podman/system/service.go
index 552c72f79..b5dd2f2aa 100644
--- a/cmd/podman/system/service.go
+++ b/cmd/podman/system/service.go
@@ -1,3 +1,5 @@
+// +build linux
+
 package system
 
 import (
diff --git a/docs/source/markdown/links/podman-image-diff.1 b/docs/source/markdown/links/podman-image-diff.1
new file mode 100644
index 000000000..ac4881f98
--- /dev/null
+++ b/docs/source/markdown/links/podman-image-diff.1
@@ -0,0 +1 @@
+.so man1/podman-diff.1
diff --git a/docs/source/markdown/links/podman-image-search.1 b/docs/source/markdown/links/podman-image-search.1
new file mode 100644
index 000000000..73e70d3e3
--- /dev/null
+++ b/docs/source/markdown/links/podman-image-search.1
@@ -0,0 +1 @@
+.so man1/podman-search.1
diff --git a/pkg/bindings/containers/containers.go b/pkg/bindings/containers/containers.go
index 74f6ded45..1ed4919e0 100644
--- a/pkg/bindings/containers/containers.go
+++ b/pkg/bindings/containers/containers.go
@@ -11,12 +11,12 @@ import (
 	"os/signal"
 	"strconv"
 	"strings"
-	"syscall"
 
 	"github.com/containers/libpod/libpod/define"
 	"github.com/containers/libpod/pkg/api/handlers"
 	"github.com/containers/libpod/pkg/bindings"
 	"github.com/containers/libpod/pkg/domain/entities"
+	sig "github.com/containers/libpod/pkg/signal"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/crypto/ssh/terminal"
@@ -397,13 +397,13 @@ func Attach(ctx context.Context, nameOrId string, detachKeys *string, logs, stre
 		}()
 
 		winChange := make(chan os.Signal, 1)
-		signal.Notify(winChange, syscall.SIGWINCH)
+		signal.Notify(winChange, sig.SIGWINCH)
 		winCtx, winCancel := context.WithCancel(ctx)
 		defer winCancel()
 
 		go func() {
 			// Prime the pump, we need one reset to ensure everything is ready
-			winChange <- syscall.SIGWINCH
+			winChange <- sig.SIGWINCH
 			for {
 				select {
 				case <-winCtx.Done():
diff --git a/pkg/specgen/namespaces.go b/pkg/specgen/namespaces.go
index 11dee1986..da1f8e8fc 100644
--- a/pkg/specgen/namespaces.go
+++ b/pkg/specgen/namespaces.go
@@ -40,6 +40,9 @@ const (
 	KeepID NamespaceMode = "keep-id"
 	// KeepId indicates to automatically create a user namespace
 	Auto NamespaceMode = "auto"
+	// DefaultKernelNamespaces is a comma-separated list of default kernel
+	// namespaces.
+	DefaultKernelNamespaces = "cgroup,ipc,net,uts"
 )
 
 // Namespace describes the namespace