diff options
author | Valentin Rothberg <rothberg@redhat.com> | 2020-08-18 16:19:59 +0200 |
---|---|---|
committer | Valentin Rothberg <rothberg@redhat.com> | 2020-08-20 10:12:27 +0200 |
commit | 524ae12977d3eb93bd8b2eac4a15c84a05a66dbb (patch) | |
tree | 8e3f5471cd71d055e9598a32c1e235a5e9cb4cef /libpod | |
parent | 9ac3a03d041161bed934ca0259fb70072b9cd8d0 (diff) | |
download | podman-524ae12977d3eb93bd8b2eac4a15c84a05a66dbb.tar.gz podman-524ae12977d3eb93bd8b2eac4a15c84a05a66dbb.tar.bz2 podman-524ae12977d3eb93bd8b2eac4a15c84a05a66dbb.zip |
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 <rothberg@redhat.com>
Diffstat (limited to 'libpod')
-rw-r--r-- | libpod/container_api.go | 2 |
1 files changed, 2 insertions, 0 deletions
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 |