Skip to content
This repository was archived by the owner on Mar 27, 2024. It is now read-only.

Update go-containerregistry to pick up docker API client negotiation #267

Merged
merged 1 commit into from
Oct 30, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 24 additions & 24 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
name = "github.com/fsouza/go-dockerclient"
version = "v1.3.0"

[[constraint]]
[[override]]
name = "github.com/docker/docker"
branch = "master"

Expand All @@ -33,4 +33,4 @@

[[constraint]]
name = "github.com/google/go-containerregistry"
revision = "dc0a77702ddab8c3dc5630eca7c026d571c1c9b7"
revision = "eb57122f1bf944d0584c387c62c1a759c953684d"
6 changes: 2 additions & 4 deletions cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -156,9 +156,7 @@ func getImageForName(imageName string) (pkgutil.Image, error) {

start := time.Now()
// TODO(nkubala): specify gzip.NoCompression here when functional options are supported
img, err = daemon.Image(ref, &daemon.ReadOptions{
Buffer: true,
})
img, err = daemon.Image(ref, daemon.WithBufferedOpener())
if err != nil {
return pkgutil.Image{}, errors.Wrap(err, "retrieving image from daemon")
}
Expand All @@ -176,7 +174,7 @@ func getImageForName(imageName string) (pkgutil.Image, error) {
return pkgutil.Image{}, errors.Wrap(err, "resolving auth")
}
start := time.Now()
img, err = remote.Image(ref, auth, http.DefaultTransport)
img, err = remote.Image(ref, remote.WithAuth(auth), remote.WithTransport(http.DefaultTransport))
if err != nil {
return pkgutil.Image{}, errors.Wrap(err, "retrieving remote image")
}
Expand Down
4 changes: 2 additions & 2 deletions differs/rpm_diff.go
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ func parsePackageData(rpmOutput []string) (map[string]util.PackageInfo, error) {
// loadImageToDaemon loads the image specified to the docker daemon.
func loadImageToDaemon(img v1.Image) (string, error) {
tag := generateValidImageTag()
resp, err := daemon.Write(tag, img, daemon.WriteOptions{})
resp, err := daemon.Write(tag, img)
if err != nil {
return "", err
}
Expand All @@ -287,7 +287,7 @@ func generateValidImageTag() name.Tag {
logrus.Warn(err.Error())
continue
}
img, _ := daemon.Image(tag, &daemon.ReadOptions{})
img, _ := daemon.Image(tag)
if img == nil {
break
}
Expand Down
19 changes: 4 additions & 15 deletions vendor/github.com/containerd/continuity/LICENSE

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/docker/docker/api/common.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 11 additions & 3 deletions vendor/github.com/docker/docker/client/request.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion vendor/github.com/docker/docker/client/service_update.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/docker/docker/pkg/fileutils/fileutils.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 12 additions & 8 deletions vendor/github.com/docker/docker/pkg/mount/sharedsubtree_linux.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions vendor/github.com/fsouza/go-dockerclient/AUTHORS

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading