Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

vndr buildkit, containerd, console #1302

Merged
merged 1 commit into from
Aug 20, 2018
Merged

vndr buildkit, containerd, console #1302

merged 1 commit into from
Aug 20, 2018

Conversation

andrewhsu
Copy link
Contributor

@andrewhsu andrewhsu commented Aug 20, 2018

- What I did

Initial intent was to update buildkit, but noticed the vendor.conf of buildkit had updates to containerd and console, so updated those in the cli repo as well.

- How I did it

$ vi vendor.conf
$ make -f docker.Makefile shell
$ vndr github.com/moby/buildkit
$ vndr github.com/containerd/containerd
$ vndr github.com/containerd/console

- How to verify it

$ make -f docker.Makefile shell
$ vndr github.com/moby/buildkit
$ vndr github.com/containerd/containerd
$ vndr github.com/containerd/console

- Description for the changelog

  • Update buildkit to e8c7acc
  • Update containerd to v1.2.0-beta.0
  • Update console to 4d8a41f

- A picture of a cute animal (not mandatory but encouraged)

🐲

@andrewhsu andrewhsu changed the title vndr buildkit, containerd, and console vndr buildkit, containerd, console; add googleapis Aug 20, 2018
Copy link
Collaborator

@tiborvass tiborvass left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@codecov-io
Copy link

codecov-io commented Aug 20, 2018

Codecov Report

Merging #1302 into master will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master    #1302   +/-   ##
=======================================
  Coverage   54.77%   54.77%           
=======================================
  Files         292      292           
  Lines       19257    19257           
=======================================
  Hits        10548    10548           
  Misses       8055     8055           
  Partials      654      654

vndr buildkit to e8c7acc
vndr containerd to v1.2.0-beta.0
vndr console to 4d8a41f

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
@andrewhsu
Copy link
Contributor Author

Got conflicts with new stuff that was recently merged to master. I'll update this PR.

@andrewhsu andrewhsu changed the title vndr buildkit, containerd, console; add googleapis vndr buildkit, containerd, console Aug 20, 2018
Copy link
Contributor

@dmcgowan dmcgowan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@andrewhsu andrewhsu merged commit 466e1b0 into docker:master Aug 20, 2018
@GordonTheTurtle GordonTheTurtle added this to the 18.09.0 milestone Aug 20, 2018
@andrewhsu andrewhsu deleted the venbk branch August 20, 2018 18:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants