mirror of
https://github.com/containers/podman.git
synced 2025-08-06 19:44:14 +08:00
bump containers/image to v5.0.0, buildah to v1.11.4
Move to containers/image v5 and containers/buildah to v1.11.4. Replace an equality check with a type assertion when checking for a docker.ErrUnauthorizedForCredentials in `podman login`. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
This commit is contained in:
10
vendor/github.com/fsouza/go-dockerclient/event.go
generated
vendored
10
vendor/github.com/fsouza/go-dockerclient/event.go
generated
vendored
@ -178,7 +178,7 @@ func (eventState *eventMonitoringState) enableEventMonitoring(c *Client) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (eventState *eventMonitoringState) disableEventMonitoring() error {
|
||||
func (eventState *eventMonitoringState) disableEventMonitoring() {
|
||||
eventState.Lock()
|
||||
defer eventState.Unlock()
|
||||
|
||||
@ -191,7 +191,6 @@ func (eventState *eventMonitoringState) disableEventMonitoring() error {
|
||||
close(eventState.C)
|
||||
close(eventState.errC)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (eventState *eventMonitoringState) monitorEvents(c *Client) {
|
||||
@ -330,17 +329,18 @@ func (c *Client) eventHijack(startTime int64, eventChan chan *APIEvents, errChan
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
//lint:ignore SA1019 this is needed here
|
||||
//nolint:staticcheck
|
||||
conn := httputil.NewClientConn(dial, nil)
|
||||
req, err := http.NewRequest("GET", uri, nil)
|
||||
req, err := http.NewRequest(http.MethodGet, uri, nil)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
//nolint:bodyclose
|
||||
res, err := conn.Do(req)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
//lint:ignore SA1019 ClientConn is needed here
|
||||
//nolint:staticcheck
|
||||
go func(res *http.Response, conn *httputil.ClientConn) {
|
||||
defer conn.Close()
|
||||
defer res.Body.Close()
|
||||
|
Reference in New Issue
Block a user