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

Add API Version Negotiation to Docker client #155

Merged
merged 2 commits into from
May 19, 2021

Conversation

rohitkg98
Copy link
Contributor

Closes #154

@codecov-commenter
Copy link

codecov-commenter commented May 14, 2021

Codecov Report

Merging #155 (713f6ee) into master (fdc2a23) will increase coverage by 0.01%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #155      +/-   ##
==========================================
+ Coverage   82.65%   82.67%   +0.01%     
==========================================
  Files          46       46              
  Lines        1810     1812       +2     
==========================================
+ Hits         1496     1498       +2     
  Misses        163      163              
  Partials      151      151              
Impacted Files Coverage Δ
docker.go 88.60% <100.00%> (+0.14%) ⬆️
gnomock.go 81.88% <100.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update fdc2a23...713f6ee. Read the comment docs.

@orlangure
Copy link
Owner

Hi @rohitkg98, thank for your contribution!

It appears that docker client has a data race when version negotiation is used, so I submitted moby/moby#42379 to fix it, and to prevent test failure in gnomock (we run most tests with -race flag on).

While I wait for resolution of the mentioned PR, I'll try to figure out how to prevent data race locally, in gnomock, so your change doesn't break any tests (even though the failure is in another package).

Sorry for not merging it sooner.

@orlangure
Copy link
Owner

Hi @rohitkg98,
I pushed 394c35b into your original branch. It fixes the data race in short term. What do you think?

If it looks OK, please rebase from master and I'll merge your fix. Thanks!

@rohitkg98 rohitkg98 force-pushed the #154-fix-version-mismatch branch from 394c35b to 713f6ee Compare May 19, 2021 06:26
@rohitkg98
Copy link
Contributor Author

Looks good! Rebased and ready to merge! Thanks for promptly addressing the issue!

@orlangure orlangure merged commit 8fb07ac into orlangure:master May 19, 2021
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.

Bug: Docker Daemon and Client version mismatch
3 participants