Merge pull request #7356 from vrothberg/2.0-vendor-image

[2.0] vendor c/image v5.5.2

cmd/podman/images/search.go

@@ -103,10 +103,6 @@ func imageSearch(cmd *cobra.Command, args []string) error {
 		return errors.Errorf("search requires exactly one argument")
 	}
 
-	if searchOptions.Limit > 100 {
-		return errors.Errorf("Limit %d is outside the range of [1, 100]", searchOptions.Limit)
-	}
-
 	// TLS verification in c/image is controlled via a `types.OptionalBool`
 	// which allows for distinguishing among set-true, set-false, unspecified
 	// which is important to implement a sane way of dealing with defaults of

docs/source/markdown/podman-search.1.md

@@ -59,7 +59,7 @@ Valid placeholders for the Go template are listed below:
 
 **--limit**=*limit*
 
-Limit the number of results. This value can be in the range between 1 and 100. The default number of results is 25.
+Limit the number of results (default 25).
 Note: The results from each registry will be limited to this value.
 Example if limit is 10 and two registries are being searched, the total
 number of results will be 20, 10 from each (if there are at least 10 matches in each).

go.mod

@@ -13,7 +13,7 @@ require (
 	github.com/containers/buildah v1.15.1
 	github.com/containers/common v0.14.6
 	github.com/containers/conmon v2.0.18+incompatible
-	github.com/containers/image/v5 v5.5.1
+	github.com/containers/image/v5 v5.5.2
 	github.com/containers/psgo v1.5.1
 	github.com/containers/storage v1.20.2
 	github.com/coreos/go-systemd/v22 v22.1.0

go.sum

@@ -77,6 +77,8 @@ github.com/containers/conmon v2.0.18+incompatible/go.mod h1:hgwZ2mtuDrppv78a/cOB
 github.com/containers/image/v5 v5.4.4/go.mod h1:g7cxNXitiLi6pEr9/L9n/0wfazRuhDKXU15kV86N8h8=
 github.com/containers/image/v5 v5.5.1 h1:h1FCOXH6Ux9/p/E4rndsQOC4yAdRU0msRTfLVeQ7FDQ=
 github.com/containers/image/v5 v5.5.1/go.mod h1:4PyNYR0nwlGq/ybVJD9hWlhmIsNra4Q8uOQX2s6E2uM=
+github.com/containers/image/v5 v5.5.2 h1:fv7FArz0zUnjH0W0l8t90CqWFlFcQrPP6Pug+9dUtVI=
+github.com/containers/image/v5 v5.5.2/go.mod h1:4PyNYR0nwlGq/ybVJD9hWlhmIsNra4Q8uOQX2s6E2uM=
 github.com/containers/libtrust v0.0.0-20190913040956-14b96171aa3b h1:Q8ePgVfHDplZ7U33NwHZkrVELsZP5fYj9pM5WBZB2GE=
 github.com/containers/libtrust v0.0.0-20190913040956-14b96171aa3b/go.mod h1:9rfv8iPl1ZP7aqh9YA68wnZv2NUDbXdcdPHVz0pFbPY=
 github.com/containers/ocicrypt v1.0.2 h1:Q0/IPs8ohfbXNxEfyJ2pFVmvJu5BhqJUAmc6ES9NKbo=

libpod/container_api.go

@@ -233,6 +233,7 @@ func (c *Container) Kill(signal uint) error {
 // This function returns when the attach finishes. It does not hold the lock for
 // the duration of its runtime, only using it at the beginning to verify state.
 func (c *Container) Attach(streams *define.AttachStreams, keys string, resize <-chan remotecommand.TerminalSize) error {
+	logrus.Errorf("normal attach")
 	if !c.batched {
 		c.lock.Lock()
 		if err := c.syncContainer(); err != nil {
@@ -268,6 +269,7 @@ func (c *Container) Attach(streams *define.AttachStreams, keys string, resize <-
 // sent.
 // At least one of streamAttach and streamLogs must be set.
 func (c *Container) HTTPAttach(httpCon net.Conn, httpBuf *bufio.ReadWriter, streams *HTTPAttachStreams, detachKeys *string, cancel <-chan bool, streamAttach, streamLogs bool) (deferredErr error) {
+	logrus.Errorf("HTTP attach")
 	isTerminal := false
 	if c.config.Spec.Process != nil {
 		isTerminal = c.config.Spec.Process.Terminal

vendor/modules.txt

@@ -94,7 +94,7 @@ github.com/containers/common/pkg/sysinfo
 github.com/containers/common/version
 # github.com/containers/conmon v2.0.18+incompatible
 github.com/containers/conmon/runner/config
-# github.com/containers/image/v5 v5.5.1
+# github.com/containers/image/v5 v5.5.2
 github.com/containers/image/v5/copy
 github.com/containers/image/v5/directory
 github.com/containers/image/v5/directory/explicitfilepath