fixes lighthouse options + do not download chromium + can use chrome-…

…stable
femtopixel · Nov 15, 2017 · ab2fad9 · ab2fad9
1 parent 523db0e
commit ab2fad9
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 1,589 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -3,7 +3,8 @@ FROM femtopixel/google-lighthouse
 MAINTAINER Jay MOULIN <[email protected]> <https://twitter.com/moulinjay>
 
 USER root
-RUN npm install -g google-lighthouse-puppeteer --unsafe-perm=true
+#https://github.com/GoogleChrome/puppeteer/blob/master/docs/troubleshooting.md
+RUN PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true npm install -g google-lighthouse-puppeteer --unsafe-perm=true
 USER chrome
 RUN mkdir -p /home/chrome/testcases && cd /home/chrome
 COPY entrypoint.sh /usr/bin/entrypoint

diff --git a/entrypoint.sh b/entrypoint.sh
@@ -2,7 +2,7 @@
 set -e
 
 if [[ -f "/home/chrome/testcases/$1.js" ]]; then
-    lighthouse-puppeteer "/home/chrome/testcases/$1.js" $2
+    lighthouse-puppeteer "/home/chrome/testcases/$1.js" "{puppeteer:{executablePath: 'google-chrome'}}"
 else
     exec "$@"
 fi

diff --git a/lighthouse-puppeteer.js b/lighthouse-puppeteer.js
@@ -2,7 +2,7 @@ class LighthousePuppeteer {
     constructor() {
         this.DEBUG_PORT = 9222;
         this.puppeteer = require('puppeteer');
-        this.lightHouse = require('lighthouse-batch');
+        this.lightHouseBatch = require('lighthouse-batch');
         this.defaultOptions = {
             debugPort: this.DEBUG_PORT,
             lighthouse: {
@@ -11,6 +11,11 @@ class LighthousePuppeteer {
                 out: '/home/chrome/reports',
                 html: true,
                 verbose: false,
+            },
+            puppeteer: {
+                args: [
+                    `--remote-debugging-port=${options.debugPort}`
+                ]
             }
         };
         this.browser = null;
@@ -28,22 +33,22 @@ class LighthousePuppeteer {
                 console.log(`${modulePath}: Module incorrectly formatted. Module should have "getUrls" method!`);
                 process.exit(-4);
             }
-            this.puppeteer.launch({args: [`--remote-debugging-port=${options.debugPort}`]})
+            this.puppeteer.launch(options.puppeteer)
                 .then(testcase.connect)
                 .then(b => new Promise((resolve) => {
                     this.browser = b;
                     resolve(b);
                 }))
                 .then(b => new Promise((resolve) => {
-                    const options = {
+                    const lighthouseOptions = {
                         verbose: options.lighthouse.verbose,
                         sites: testcase.getUrls(),
                         html: options.lighthouse.html,
                         out: options.lighthouse.out,
                         useGlobal: options.lighthouse.useGlobal,
                         params: `--port ${options.debugPort} ${options.lighthouse.params}`,
                     };
-                    this.lightHouse(options);
+                    this.lightHouseBatch(lighthouseOptions);
                     resolve(b);
                 }))
                 .then(b => b.close())