github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2026-04-03 05:11:37 +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

2
src/moby/build.go
View File

@@ -14,7 +14,7 @@ import (
"strconv"
"strings"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
"gopkg.in/yaml.v2"
)

2
src/moby/config.go
View File

@@ -8,11 +8,11 @@ import (
"strconv"
"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/opencontainers/runtime-spec/specs-go"
log "github.com/sirupsen/logrus"
"github.com/xeipuuv/gojsonschema"
"gopkg.in/yaml.v2"
)

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

2
src/moby/image.go
View File

@@ -10,9 +10,9 @@ import (
"path"
"strings"
log "github.com/Sirupsen/logrus"
"github.com/containerd/containerd/reference"
"github.com/opencontainers/runtime-spec/specs-go"
log "github.com/sirupsen/logrus"
)
type tarWriter interface {

2
src/moby/linuxkit.go
View File

@@ -10,7 +10,7 @@ import (
"os/exec"
"path/filepath"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
)
var linuxkitYaml = map[string]string{"mkimage": `

2
src/moby/output.go
View File

@@ -8,8 +8,8 @@ import (
"os"
"runtime"
log "github.com/Sirupsen/logrus"
"github.com/moby/tool/src/initrd"
log "github.com/sirupsen/logrus"
)
const (

14
src/moby/trust.go
View File

@@ -15,20 +15,20 @@ import (
"strings"
"time"
log "github.com/Sirupsen/logrus"
"github.com/docker/distribution/reference"
"github.com/docker/distribution/registry/client/auth"
"github.com/docker/distribution/registry/client/auth/challenge"
"github.com/docker/distribution/registry/client/transport"
notaryClient "github.com/docker/notary/client"
"github.com/docker/notary/trustpinning"
"github.com/docker/notary/tuf/data"
"github.com/opencontainers/go-digest"
log "github.com/sirupsen/logrus"
notaryClient "github.com/theupdateframework/notary/client"
"github.com/theupdateframework/notary/trustpinning"
"github.com/theupdateframework/notary/tuf/data"
)
var (
// ReleasesRole is the role named "releases"
ReleasesRole = path.Join(data.CanonicalTargetsRole, "releases")
ReleasesRole = data.RoleName(path.Join(data.CanonicalTargetsRole.String(), "releases"))
)
// TrustedReference parses an image string, and does a notary lookup to verify and retrieve the signed digest reference
@@ -69,9 +69,9 @@ func TrustedReference(image string) (reference.Reference, error) {
rt = nil
}
nRepo, err := notaryClient.NewNotaryRepository(
nRepo, err := notaryClient.NewFileCachedRepository(
trustDirectory(),
gun,
data.GUN(gun),
server,
rt,
nil,