From 524ae12977d3eb93bd8b2eac4a15c84a05a66dbb Mon Sep 17 00:00:00 2001 From: Valentin Rothberg Date: Tue, 18 Aug 2020 16:19:59 +0200 Subject: vendor c/image v5.5.2 Enable pagination until the search result reaches the limit, instead of returning default 100 limit from registry API. BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1866153 Signed-off-by: Valentin Rothberg --- libpod/container_api.go | 2 ++ 1 file changed, 2 insertions(+) (limited to 'libpod/container_api.go') diff --git a/libpod/container_api.go b/libpod/container_api.go index 487f75e67..9d27a65a8 100644 --- a/libpod/container_api.go +++ b/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 -- cgit v1.2.3-54-g00ecf