Merge pull request #327 from snyk/fix/undefined-base-image

fix: Undefined base image
snyk · Jan 9, 2019 · a8c561d · a8c561d
2 parents bc82842 + 962810a
commit a8c561d
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/src/cli/commands/test.js b/src/cli/commands/test.js
@@ -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 (
@@ -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 = '';