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

fix: Undefined base image #327

Merged
merged 1 commit into from
Jan 9, 2019
Merged

fix: Undefined base image #327

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions src/cli/commands/test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,9 +358,7 @@ function formatIssues(vuln, options) {
? createRemediationText(vuln, packageManager)
: '',
fixedIn: options.docker ? createFixedInText(vulnerableRange, version) : '',
dockerfilePackage: options.docker && vuln.dockerfileInstruction
? `\n Introduced in your Dockerfile by '${ vuln.dockerfileInstruction }'`
: `\n Introduced by your base image (${ vuln.dockerBaseImage })`,
dockerfilePackage: options.docker ? dockerfileInstructionText(vuln) : '',
};

return (
Expand All @@ -377,6 +375,18 @@ function formatIssues(vuln, options) {
);
}

function dockerfileInstructionText(vuln) {
if (vuln.dockerfileInstruction) {
return `\n Introduced in your Dockerfile by '${ vuln.dockerfileInstruction }'`;
}

if (vuln.dockerBaseImage) {
return `\n Introduced by your base image (${ vuln.dockerBaseImage })`;
}

return '';
}

function createFixedInText(versionRangeList, pkgVersion) {
let fixedVersion = '';
let fixedVersionCandidate = '';
Expand Down