github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2026-04-26 08:28:46 +00:00
Code Issues Projects Releases Wiki Activity

Update dependencies to use sirupsen not Sirupsen

Browse Source 
That entailed a few other fixes, eg small Notary API changes.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
This commit is contained in:
Justin Cormack
2017-11-01 12:14:20 +00:00
parent 99480b5dd0
commit 45333d2480
288 changed files with 5855 additions and 10377 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/moby/docker.go
View File

@@ -13,12 +13,12 @@ import (
"os/exec"
"strings"
log "github.com/Sirupsen/logrus"
"github.com/containerd/containerd/reference"
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/filters"
"github.com/docker/docker/client"
log "github.com/sirupsen/logrus"
"golang.org/x/net/context"
)
@@ -181,7 +181,7 @@ func dockerInspectImage(cli *client.Client, ref *reference.Spec, trustedPull boo
inspect, _, err := cli.ImageInspectWithRaw(context.Background(), ref.String())
if err != nil {
if client.IsErrImageNotFound(err) {
if client.IsErrNotFound(err) {
pullErr := dockerPull(ref, true, trustedPull)
if pullErr != nil {
return types.ImageInspect{}, pullErr