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 : RegistryService should also consider buildArgs while resolving base images (#1778) #1795

Merged
merged 1 commit into from
Jul 14, 2024

Conversation

rohanKanojia
Copy link
Member

@rohanKanojia rohanKanojia commented Jun 22, 2024

Fix #1778

  • Make RegistryService use methods of resolving args from BuildService
  • Remove AbstractBuildSupportMojo (there were only one field and method there), moved those to AbstractDockerMojo
  • Run a local docker registry before running integration tests for verifying push
  • Add integration test for docker push with build args supplied from maven properties
  • Move Build Args resolver logic to BuildArgResolver utility class

Copy link

codecov bot commented Jun 22, 2024

Codecov Report

Attention: Patch coverage is 79.10448% with 14 lines in your changes missing coverage. Please review.

Project coverage is 65.87%. Comparing base (150970d) to head (c745446).
Report is 3 commits behind head on master.

Current head c745446 differs from pull request most recent head 5acb239

Please upload reports for the commit 5acb239 to get more accurate results.

Additional details and impacted files
@@            Coverage Diff            @@
##             master    #1795   +/-   ##
=========================================
  Coverage     65.87%   65.87%           
+ Complexity     2306     2303    -3     
=========================================
  Files           172      172           
  Lines         10194    10190    -4     
  Branches       1408     1407    -1     
=========================================
- Hits           6715     6713    -2     
+ Misses         2926     2925    -1     
+ Partials        553      552    -1     
Files Coverage Δ
...va/io/fabric8/maven/docker/AbstractDockerMojo.java 60.11% <100.00%> (+1.22%) ⬆️
...c/main/java/io/fabric8/maven/docker/BuildMojo.java 36.78% <100.00%> (+2.25%) ⬆️
...rc/main/java/io/fabric8/maven/docker/PushMojo.java 53.84% <100.00%> (ø)
.../fabric8/maven/docker/service/RegistryService.java 84.34% <100.00%> (+1.14%) ⬆️
.../main/java/io/fabric8/maven/docker/SourceMojo.java 0.00% <0.00%> (ø)
...c/main/java/io/fabric8/maven/docker/WatchMojo.java 0.00% <0.00%> (ø)
.../io/fabric8/maven/docker/service/BuildService.java 64.70% <91.66%> (-0.24%) ⬇️
.../maven/docker/service/helper/BuildArgResolver.java 70.27% <70.27%> (ø)

@rohanKanojia rohanKanojia changed the title fix : RegistryService should also consider buildArgs while resolving base images fix : RegistryService should also consider buildArgs while resolving base images (#1778) Jun 22, 2024
@rohanKanojia rohanKanojia force-pushed the pr/issue1778 branch 2 times, most recently from ea54609 to bf71b51 Compare July 14, 2024 07:24
Copy link

@rohanKanojia rohanKanojia marked this pull request as ready for review July 14, 2024 13:26
@rohanKanojia rohanKanojia merged commit e980189 into fabric8io:master Jul 14, 2024
18 checks passed
@rohanKanojia rohanKanojia deleted the pr/issue1778 branch July 14, 2024 13:27
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.

docker:push failed with ARG in FROM
1 participant