Start testing with cross compilation

Add missing man page links for podman-image-search and
podman-image-diff

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
Daniel J Walsh 2020-05-21 10:55:58 -04:00
parent a852afab2f
commit 2e7d2c2f47
No known key found for this signature in database
GPG Key ID: A2DF901DABE2C028
7 changed files with 11 additions and 6 deletions

View File

@ -646,7 +646,6 @@ special_testing_in_podman_task:
special_testing_cross_task:
skip: $CI == 'true'
alias: "special_testing_cross"
depends_on:
- "gating"

View File

@ -12,7 +12,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"
@ -60,7 +59,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)
}

View File

@ -1,3 +1,5 @@
// +build linux
package system
import (

View File

@ -0,0 +1 @@
.so man1/podman-diff.1

View File

@ -0,0 +1 @@
.so man1/podman-search.1

View File

@ -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():

View File

@ -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