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.

Sign up for GitHub

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

Jump to bottom

Fix #174: Build failure when trying to use Dockerfile for arguments in FROM #175

Merged
merged 1 commit into from
Oct 30, 2020
Merged

Fix #174: Build failure when trying to use Dockerfile for arguments in FROM #175

merged 1 commit into from
Oct 30, 2020

Conversation

rohanKanojia
Copy link
Member

@codecov
Copy link

codecov bot commented May 4, 2020 •
edited
Loading

Codecov Report

Merging #175 into master will increase coverage by 0.10%.
The diff coverage is 74.57%.

Impacted file tree graph

@@             Coverage Diff              @@
##             master     #175      +/-   ##
============================================
+ Coverage     37.38%   37.48%   +0.10%     
- Complexity     2455     2474      +19     
============================================
  Files           389      389              
  Lines         19103    19152      +49     
  Branches       2788     2799      +11     
============================================
+ Hits           7141     7180      +39     
- Misses        11114    11117       +3     
- Partials        848      855       +7
Impacted Files Coverage Δ Complexity Δ
...e/jkube/kit/build/service/docker/BuildService.java 0.00% <0.00%> (ø) 0.00 <0.00> (ø)
...onfig/service/openshift/OpenshiftBuildService.java 53.03% <0.00%> (ø) 46.00 <0.00> (ø)
...pse/jkube/kit/build/api/helper/DockerFileUtil.java 61.29% <77.19%> (+11.95%) 31.00 <19.00> (+19.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 3005d57...2b693e6. Read the comment docs.

@rohanKanojia rohanKanojia requested a review from manusa May 5, 2020 10:46
@manusa
Copy link
Member

manusa commented May 6, 2020

Waiting on fabric8io/docker-maven-plugin#1299 to be merged in order to keep changes in both projects consistent.

devang-gaur
devang-gaur suggested changes May 8, 2020
View reviewed changes
Copy link
Contributor

@devang-gaur devang-gaur left a comment

Choose a reason for hiding this comment

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

just a tiny change requested. everything else LGTM

...e/docker/src/main/java/org/eclipse/jkube/kit/build/service/docker/helper/DockerFileUtil.java Outdated
@@ -56,23 +56,40 @@ private DockerFileUtil() {}
*/
public static List<String> extractBaseImages(File dockerFile, Properties properties) throws IOException {
List<String[]> fromLines = extractLines(dockerFile, "FROM", properties);
Map<String, String> args = extractArgs(extractLines(dockerFile, "ARG", properties));
Set<String> result = new LinkedHashSet<>();
Set<String> fromAlias = new HashSet<>();
for (String[] fromLine : fromLines) {
if (fromLine.length > 1) {
Copy link
Contributor

Choose a reason for hiding this comment

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

this if condition feels redundant.

Copy link
Contributor

Choose a reason for hiding this comment

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

Line 63

@sonarqubecloud
Copy link

SonarCloud Quality Gate failed.

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities (and Security Hotspot 0 Security Hotspots to review)
Code Smell A 0 Code Smells

67.7% 67.7% Coverage
0.0% 0.0% Duplication

@rohanKanojia rohanKanojia deleted the pr/issue174 branch July 8, 2020 05:42
@manusa
Copy link
Member

manusa commented Jul 15, 2020

Why is this one closed?

@rohanKanojia rohanKanojia restored the pr/issue174 branch July 15, 2020 05:40
@rohanKanojia rohanKanojia reopened this Jul 15, 2020
@sonarqubecloud
Copy link

SonarCloud Quality Gate failed.

Bug C 1 Bug
Vulnerability A 0 Vulnerabilities (and Security Hotspot 0 Security Hotspots to review)
Code Smell A 0 Code Smells

89.4% 89.4% Coverage
0.0% 0.0% Duplication

warning The version of Java (1.8.0_131) you have used to run this analysis is deprecated and we will stop accepting it from October 2020. Please update to at least Java 11.
Read more here

@manusa
Copy link
Member

manusa commented Oct 27, 2020

Was this ported fabric8io/docker-maven-plugin#1373 too? or is it not applicable?

@rohanKanojia
Copy link
Member Author

ah, I still need to update this PR. Sorry, I will update it within this week

@manusa manusa added this to the 1.0.2 milestone Oct 30, 2020
@rohanKanojia rohanKanojia force-pushed the pr/issue174 branch 3 times, most recently from 7355a25 to 50ec7f0 Compare October 30, 2020 11:11
@sonarqubecloud
Copy link

Kudos, SonarCloud Quality Gate passed!

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities (and Security Hotspot 0 Security Hotspots to review)
Code Smell A 0 Code Smells

84.0% 84.0% Coverage
0.0% 0.0% Duplication

warning The version of Java (1.8.0_131) you have used to run this analysis is deprecated and we will stop accepting it accepting it soon.Please update to at least Java 11.
Read more here

@manusa manusa merged commit 72188e1 into eclipse-jkube:master Oct 30, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@devang-gaur devang-gaur devang-gaur requested changes

@manusa manusa manusa approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
1.0.2
Development

Successfully merging this pull request may close these issues.

Build failure when trying to use Dockerfile for arguments in FROM
3 participants
@rohanKanojia @manusa @devang-gaur