Skip to content

Bump docker dependency to v20.10.0-beta#960

Merged
jromero merged 2 commits intobuildpacks:mainfrom
nkubala:docker-dep
Nov 19, 2020
Merged

Bump docker dependency to v20.10.0-beta#960
jromero merged 2 commits intobuildpacks:mainfrom
nkubala:docker-dep

Conversation

@nkubala
Copy link
Contributor

@nkubala nkubala commented Nov 18, 2020

Summary

Updates the version of the docker/docker dependency to v20.10.0-beta, specifically to match moby/buildkit.

Selfishly, this is done so that we can resolve a dependency issue in https://github.com/GoogleContainerTools/skaffold, where we vendor both buildkit and pack.

This change is non-functional.

Output

N/A

Documentation

  • Should this change be documented?
    • Yes, see #___
    • No

Related

Resolves #___

@nkubala nkubala requested a review from a team as a code owner November 18, 2020 22:47
@nkubala
Copy link
Contributor Author

nkubala commented Nov 18, 2020

looks like make verify-format is failing because the imports in the generated files got moved around. I generated this code with make generate so I'm not sure why this is happening...should I fix manually?

@dfreilich
Copy link
Member

Hey @nkubala , thanks for the PR! Yes, if you could fix the imports (either by hand or by make tidy) to get these checks passing, that would be great.

@dfreilich dfreilich added this to the 0.16.0 milestone Nov 19, 2020
@dfreilich dfreilich added the type/chore Issue that requests non-user facing changes. label Nov 19, 2020
Signed-off-by: Nick Kubala <nkubala@google.com>
Signed-off-by: Nick Kubala <nkubala@google.com>
@codecov
Copy link

codecov bot commented Nov 19, 2020

Codecov Report

Merging #960 (4c5b36a) into main (9304f5a) will not change coverage.
The diff coverage is 33.34%.

Impacted file tree graph

@@           Coverage Diff           @@
##             main     #960   +/-   ##
=======================================
  Coverage   77.63%   77.63%           
=======================================
  Files         103      103           
  Lines        5005     5005           
=======================================
  Hits         3885     3885           
  Misses        725      725           
  Partials      395      395           
Flag Coverage Δ
os_linux 77.63% <33.34%> (+0.06%) ⬆️
os_macos 74.61% <0.00%> (+0.04%) ⬆️
os_windows 100.00% <ø> (ø)
unit 77.63% <33.34%> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

@nkubala
Copy link
Contributor Author

nkubala commented Nov 19, 2020

@dfreilich fixed everything up. codecov is failing, but since this doesn't really introduce any new code i'm not sure how to fix it apart from writing you guys some new tests :) let me know what i should do.

@jromero
Copy link
Member

jromero commented Nov 19, 2020

@nkubala I'm sure we can overlook codecov :D

We recently ran into dependency issue in relation to docker (aka moby/moby). You can see the details here. I realize that this is a newer version and that given the fact that it compiles and none of the tests fail, it should provide a higher level of compatibility.

Out of curiosity, have you requested that this newer version also be update in go-containerregistry. I see that skaffold also uses go-containerregistry.

@nkubala
Copy link
Contributor Author

nkubala commented Nov 19, 2020

@jromero haven't we all run into dependency issues with moby/moby 😆 hopefully this change will only alleviate some pain in the future though.

i haven't bumped go-containerregistry yet, but it was a source of several transitive dependencies that cause pain in skaffold so it'll likely be next up :)

is this PR ok to merge?

Copy link
Member

@jromero jromero left a comment

Choose a reason for hiding this comment

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

Let's give it a shot. 🤞

If we find some issues we will have to revert.

@jromero jromero merged commit f85ce47 into buildpacks:main Nov 19, 2020
@nkubala
Copy link
Contributor Author

nkubala commented Nov 19, 2020

sounds good, if it ends up getting reverted tag me and i can try and look again.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

type/chore Issue that requests non-user facing changes.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants