Skip to content

Commit

Permalink
Update cnab-to-oci to v0.2.0-beta1 (#639)
Browse files Browse the repository at this point in the history
Signed-off-by: Radu M <[email protected]>
  • Loading branch information
Radu M authored and jeremyrickard committed Oct 8, 2019
1 parent ece9d0e commit 5eafd3b
Show file tree
Hide file tree
Showing 11 changed files with 260 additions and 226 deletions.
7 changes: 4 additions & 3 deletions Gopkg.lock

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

3 changes: 1 addition & 2 deletions Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,9 @@
version = "v0.5.0-beta1"


# Using master until there is a release of cnab-to-oci
[[constraint]]
name = "github.com/docker/cnab-to-oci"
branch = "master"
version = "v0.2.0-beta1"

[[constraint]]
name = "github.com/carolynvs/datetime-printer"
Expand Down
6 changes: 3 additions & 3 deletions pkg/cnab/cnab-to-oci/registry.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ func (r *Registry) PullBundle(tag string, insecureRegistry bool) (*bundle.Bundle
insecureRegistries = append(insecureRegistries, reg)
}

bun, err := remotes.Pull(context.Background(), ref, r.createResolver(insecureRegistries))
bun, _, err := remotes.Pull(context.Background(), ref, r.createResolver(insecureRegistries))
if err != nil {
return nil, errors.Wrap(err, "unable to pull remote bundle")
}
Expand All @@ -63,11 +63,11 @@ func (r *Registry) PushBundle(bun *bundle.Bundle, tag string, insecureRegistry b

resolver := r.createResolver(insecureRegistries)

err = remotes.FixupBundle(context.Background(), bun, ref, resolver, remotes.WithEventCallback(r.displayEvent))
rm, err := remotes.FixupBundle(context.Background(), bun, ref, resolver, remotes.WithEventCallback(r.displayEvent), remotes.WithAutoBundleUpdate())
if err != nil {
return err
}
d, err := remotes.Push(context.Background(), bun, ref, resolver, true)
d, err := remotes.Push(context.Background(), bun, rm, ref, resolver, true)
if err != nil {
return err
}
Expand Down
215 changes: 98 additions & 117 deletions vendor/github.com/docker/cnab-to-oci/converter/convert.go

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

Loading

0 comments on commit 5eafd3b

Please sign in to comment.