Merge pull request #4310 from nalind/manifest-lists

Move to containers/image v5, support manifest lists

1 files changed, 5 insertions, 5 deletions

diff --git a/vendor/github.com/fsouza/go-dockerclient/event.go b/vendor/github.com/fsouza/go-dockerclient/event.go
index 3a3364d9d..6de7c5535 100644
--- a/vendor/github.com/fsouza/go-dockerclient/event.go
+++ b/vendor/github.com/fsouza/go-dockerclient/event.go
@@ -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()