build: fix missing proxy build args for classic builder#10887
Merged
Conversation
Refactor to use a consistent code path for determining the build args for a service image regardless of whether BuildKit or the classic builder is being used. After recent changes, these code paths had diverged, so the classic builder was missing the proxy variables from the Docker client config. Signed-off-by: Milas Bowman <[email protected]>
milas
requested review from
a team,
StefanScherer,
glours,
laurazard,
ndeloof,
nicksieger and
ulyssessouza
and removed request for
a team
August 8, 2023 19:28
Contributor
Author
|
GitHub broke on #10876, it wasn't seeing the rebase with the fixed merge conflict, so I closed it, and now I can't re-open it (because NOW it could see the rebase) 🤦🏻 |
Codecov ReportPatch coverage:
Additional details and impacted files@@ Coverage Diff @@
## v2 #10887 +/- ##
==========================================
+ Coverage 58.81% 58.87% +0.06%
==========================================
Files 120 120
Lines 10454 10446 -8
==========================================
+ Hits 6148 6150 +2
+ Misses 3706 3698 -8
+ Partials 600 598 -2
☔ View full report in Codecov by Sentry. |
glours
approved these changes
Aug 8, 2023
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What I did
Refactor to use a consistent code path for determining the build args for a service image regardless of whether BuildKit or the classic builder is being used.
After recent changes, these code paths had diverged, so the classic builder was missing the proxy variables from the Docker client config.
Related issue
(not mandatory) A picture of a cute animal, if possible in relation to what you did
