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

fix (BuildService) : Image Build Config BuildArgs should be passed while pulling images (#1756) #1759

Merged
merged 1 commit into from
Feb 24, 2024

Conversation

rohanKanojia
Copy link
Member

Description

Fix #1756

Fixes regression introduced by #1731

In #1731, we added support for specifying docker build args from maven/system properties. However, I missed it in review that build args specified in plugin image build configuration are no longer passed to autoPullBaseImage.

Ensure we merge image build configuration build args with args provided via maven/system properties before passing them to autoPullBaseImage

Copy link

codecov bot commented Feb 23, 2024

Codecov Report

Merging #1759 (8fa0c7b) into master (e8c5826) will decrease coverage by 0.01%.
Report is 1 commits behind head on master.
The diff coverage is 100.00%.

Additional details and impacted files
@@             Coverage Diff              @@
##             master    #1759      +/-   ##
============================================
- Coverage     65.76%   65.75%   -0.01%     
- Complexity     2294     2295       +1     
============================================
  Files           172      172              
  Lines         10184    10181       -3     
  Branches       1405     1405              
============================================
- Hits           6697     6695       -2     
  Misses         2934     2934              
+ Partials        553      552       -1     
Files Coverage Δ
.../io/fabric8/maven/docker/service/BuildService.java 64.94% <100.00%> (+0.79%) ⬆️

... and 2 files with indirect coverage changes

@rohanKanojia rohanKanojia marked this pull request as ready for review February 24, 2024 15:39
…ile pulling images (fabric8io#1756)

Fixes regression introduced by fabric8io#1731

In fabric8io#1731, we added support for specifying docker build args from
maven/system properties. However, I missed it in review that build args
specified in plugin image build configuration are no longer passed to
autoPullBaseImage.

Ensure we merge image build configuration build args with args provided
via maven/system properties before passing them to autoPullBaseImage

Signed-off-by: Rohan Kumar <[email protected]>
Copy link

sonarcloud bot commented Feb 24, 2024

@rohanKanojia rohanKanojia merged commit 110a8f8 into fabric8io:master Feb 24, 2024
20 checks passed
@rohanKanojia rohanKanojia deleted the pr/issue1756 branch February 24, 2024 16:23
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.

Build arg regression with 0.44.0
1 participant