diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-03-26 19:38:49 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-26 19:38:49 +0000 |
| commit | f3024b906ce717f7858c138a9c1daf72bdb8d132 (patch) | |
| tree | 2c1adfa8ca6f622a88f03402dc7ff49524bf388d /vendor/github.com/fsouza/go-dockerclient/container_remove.go | |
| parent | c81e273835303664d62c4e958a7f34877c05ed49 (diff) | |
| parent | fc197fb4f5c0e0d90da39fe672bce7d145272415 (diff) | |
| download | podman-f3024b906ce717f7858c138a9c1daf72bdb8d132.tar.gz podman-f3024b906ce717f7858c138a9c1daf72bdb8d132.tar.bz2 podman-f3024b906ce717f7858c138a9c1daf72bdb8d132.zip | |
Merge pull request #9821 from rhatdan/VENDOR
[NO TESTS NEEDED] Vendor in containers/buildah v1.20.0
Diffstat (limited to 'vendor/github.com/fsouza/go-dockerclient/container_remove.go')
| -rw-r--r-- | vendor/github.com/fsouza/go-dockerclient/container_remove.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/vendor/github.com/fsouza/go-dockerclient/container_remove.go b/vendor/github.com/fsouza/go-dockerclient/container_remove.go index 23298f51c..dbe0907f0 100644 --- a/vendor/github.com/fsouza/go-dockerclient/container_remove.go +++ b/vendor/github.com/fsouza/go-dockerclient/container_remove.go @@ -2,6 +2,7 @@ package docker import ( "context" + "errors" "net/http" ) @@ -29,7 +30,8 @@ func (c *Client) RemoveContainer(opts RemoveContainerOptions) error { path := "/containers/" + opts.ID + "?" + queryString(opts) resp, err := c.do(http.MethodDelete, path, doOptions{context: opts.Context}) if err != nil { - if e, ok := err.(*Error); ok && e.Status == http.StatusNotFound { + var e *Error + if errors.As(err, &e) && e.Status == http.StatusNotFound { return &NoSuchContainer{ID: opts.ID} } return err |