Merge pull request #139 from marccampbell/from-with-as

Detect FROM with as and ports

Author: marccampbell

lib/checks.js

@@ -38,12 +38,12 @@ var commands = module.exports = {
     if (args.includes('@')) {
       baseImage = args.split('@');
     } else {
-      baseImage = args.split(':');
+      baseImage = args.split(' ')[0].split(":");
     }
     var result = [];
     if (baseImage.length === 1) {
       result.push('missing_tag');
-    } else if (baseImage[1] === 'latest') {
+    } else if (baseImage[baseImage.length - 1] === 'latest') {
       result.push('latest_tag');
     }
 

test/examples/Dockerfile.from-as

@@ -0,0 +1 @@
+FROM repo/image:latest as example

test/examples/Dockerfile.from-with-port

@@ -0,0 +1 @@
+FROM some.registry:1234/repo/image:latest

test/examples/Dockerfile.from-with-port-no-latest

@@ -0,0 +1 @@
+FROM some.registry:1234/repo/image:abcde

test/index.js

@@ -81,6 +81,47 @@ describe("index", function(){
     });
   });
 
+  describe("#from-with-as", function () {
+    it("validates the Dockerfile detects latest when using as", function () {
+      var expected = [
+        { title: 'Base Image Latest Tag',
+          line: 1,
+          rule: 'latest_tag'}
+      ];
+      const lintResult = dockerfilelint.run('./test/examples', fs.readFileSync('./test/examples/Dockerfile.from-as', 'UTF-8'));
+      _.forEach(lintResult, function(r) {
+        delete r['description'];
+        delete r['category'];
+      });
+      expect(lintResult).to.have.length(expected.length);
+      expect(lintResult).to.deep.equal(expected);
+    });
+  });
+
+  describe("#from-with-port", function () {
+    it("validates the Dockerfile detects latest when it has a port", function () {
+      var expected = [
+        { title: 'Base Image Latest Tag',
+          line: 1,
+          rule: 'latest_tag'}
+      ];
+      const lintResult = dockerfilelint.run('./test/examples', fs.readFileSync('./test/examples/Dockerfile.from-with-port', 'UTF-8'));
+      _.forEach(lintResult, function(r) {
+        delete r['description'];
+        delete r['category'];
+      });
+      expect(lintResult).to.have.length(expected.length);
+      expect(lintResult).to.deep.equal(expected);
+    });
+  });
+
+  describe("#from-with-port-no-latest", function () {
+    it("validates the Dockerfile detects not latest when it has a port", function () {
+      const lintResult = dockerfilelint.run('./test/examples', fs.readFileSync('./test/examples/Dockerfile.from-with-port-no-latest', 'UTF-8'));
+      expect(lintResult).to.have.length(0);
+    });
+  });
+
   describe("#shell", function() {
     it("validates the shell command is accepted when entered correctly", function() {
       expect(dockerfilelint.run('./test/examples', fs.readFileSync('./test/examples/Dockerfile.shell.pass', 'UTF-8'))).to.be.empty;