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

bump docker dependencies version #9925

Merged
merged 3 commits into from
Oct 18, 2022
Merged

Conversation

glours
Copy link
Contributor

@glours glours commented Oct 18, 2022

Signed-off-by: Guillaume Lours 705411+glours@users.noreply.github.com

What I did
Bump version of Docker binaries
To limit the impact of this PR, I didn't change the timeout type in the API and just add a conversion function for now

(not mandatory) A picture of a cute animal, if possible in relation with what you did
image

@glours glours self-assigned this Oct 18, 2022
@glours glours force-pushed the update-docker-dependencies branch 2 times, most recently from 9d2c170 to ad7909b Compare October 18, 2022 13:56
Comment on lines +151 to 154
github.com/docker/cli => github.com/docker/cli v20.10.3-0.20221013132413-1d6c6e2367e2+incompatible // 22.06 master branch
github.com/docker/docker => github.com/docker/docker v20.10.3-0.20221013203545-33ab36d6b304+incompatible // 22.06 branch
github.com/moby/buildkit => github.com/moby/buildkit v0.10.1-0.20220816171719-55ba9d14360a // same as buildx

Copy link
Member

Choose a reason for hiding this comment

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

oh! compose is already using 22.06 branch? Hm...

Copy link
Contributor Author

@glours glours Oct 18, 2022

Choose a reason for hiding this comment

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

yes, IIRC it was needed to use latest features offered by buildx (which is doing the same btw)

Copy link
Contributor

Choose a reason for hiding this comment

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

There's also some code around the plugin init that's only in 22.06 IIRC

Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
@codecov-commenter
Copy link

codecov-commenter commented Oct 18, 2022

Codecov Report

Base: 75.86% // Head: 75.86% // No change to project coverage 👍

Coverage data is based on head (3f0550f) compared to base (c384905).
Patch has no changes to coverable lines.

Additional details and impacted files
@@           Coverage Diff           @@
##               v2    #9925   +/-   ##
=======================================
  Coverage   75.86%   75.86%           
=======================================
  Files           2        2           
  Lines         232      232           
=======================================
  Hits          176      176           
  Misses         49       49           
  Partials        7        7           

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
@glours glours marked this pull request as ready for review October 18, 2022 15:14
@glours glours requested review from a team, nicksieger, ndeloof, StefanScherer, ulyssessouza, milas and laurazard and removed request for a team October 18, 2022 15:15
Copy link
Member

@nicksieger nicksieger left a comment

Choose a reason for hiding this comment

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

LGTM

pkg/compose/build_buildkit.go Outdated Show resolved Hide resolved
Comment on lines 106 to 107
if f, err = driver.GetFactory(ng.Driver, true); f == nil || err != nil {
return nil, fmt.Errorf("failed to find buildx driver %q, error: %s", ng.Driver, err.Error())
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
if f, err = driver.GetFactory(ng.Driver, true); f == nil || err != nil {
return nil, fmt.Errorf("failed to find buildx driver %q, error: %s", ng.Driver, err.Error())
if f, err = driver.GetFactory(ng.Driver, true); f == nil || err != nil {
return nil, fmt.Errorf("failed to find buildx driver %q, error: %v", ng.Driver, err)

Minor: I assume it's an invariant that f != nil if err == nil so this is probably excessively defensive

Co-authored-by: Nick Sieger <nicksieger@gmail.com>
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
@glours glours enabled auto-merge October 18, 2022 15:35
@glours glours merged commit 32ae036 into docker:v2 Oct 18, 2022
@glours glours deleted the update-docker-dependencies branch January 11, 2023 14:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants