Fix Docker build

bin/wappalyzer-build

@@ -24,7 +24,7 @@ node $WAPPALYZER_NODE_PATH/node_modules/jsonlint/lib/cli.js -ist $'\t' $WAPPALYZ
 
 echo "Compressing PNG and SVG icons..."
 
-node $WAPPALYZER_NODE_PATH/node_modules/imagemin-cli/cli.js $WAPPALYZER_ROOT/src/icons/* $WAPPALYZER_ROOT/src/icons
+node $WAPPALYZER_NODE_PATH/node_modules/imagemin-cli/cli.js $WAPPALYZER_ROOT/src/icons/* --out-dir $WAPPALYZER_ROOT/src/icons
 
 echo "Converting SVG icons to PNG..."
 

docker/Dockerfile

@@ -8,9 +8,9 @@ ENV WAPPALYZER_ROOT /home/wappalyzer/synced
 ENV WAPPALYZER_NODE_PATH /home/wappalyzer/node
 
 # Install packages
-RUN apt-get update && apt-get install -y sudo curl bzip2 zip libfreetype6 libfontconfig
+RUN apt-get update && apt-get install -y sudo curl
 RUN curl -sL https://deb.nodesource.com/setup_6.x | bash -
-RUN apt-get install -y nodejs
+RUN apt-get install -y nodejs bzip2 zip libfreetype6 libfontconfig
 RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 
@@ -39,7 +39,6 @@ RUN su wappalyzer -c "mkdir $WAPPALYZER_NODE_PATH"
 
 ADD node/package.json $WAPPALYZER_NODE_PATH/package.json
 
-RUN ln -s -f /usr/local/bin/npm /usr/bin/npm
 RUN su wappalyzer -c "cd $WAPPALYZER_NODE_PATH && npm i"
 
 

src/apps.json

@@ -899,6 +899,18 @@
 			},
 			"website": "browsercms.org"
 		},
+		"Bubble": {
+			"cats": [
+				1,
+				3,
+				18,
+				22
+			],
+			"env": "^appquery$",
+			"icon": "bubble.png",
+			"implies": "Node.js",
+			"website": "bubble.is"
+		},
 		"BugSense": {
 			"cats": [
 				10
@@ -4761,6 +4773,34 @@
 			"icon": "Nedstat.png",
 			"website": "www.nedstat.com"
 		},
+		"Neos CMS": {
+			"cats": [
+				1
+			],
+			"excludes": "TYPO3 CMS",
+			"headers": {
+				"X-Flow-Powered": "Neos/?(.+)?$\\;version:\\1"
+			},
+			"icon": "Neos.svg",
+			"implies": [
+				"PHP",
+				"Neos Flow"
+			],
+			"url": "/neos/",
+			"website": "neos.io"
+		},
+		"Neos Flow": {
+			"cats": [
+				18
+			],
+			"excludes": "TYPO3 CMS",
+			"headers": {
+				"X-Flow-Powered": "Flow/?(.+)?$\\;version:\\1"
+			},
+			"icon": "Neos.svg",
+			"implies": "PHP",
+			"website": "flow.neos.io"
+		},
 		"Nepso": {
 			"cats": [
 				1
@@ -6968,34 +7008,6 @@
 			"url": "/typo3/",
 			"website": "www.typo3.org"
 		},
-		"Neos Flow": {
-			"cats": [
-				18
-			],
-			"excludes": "TYPO3 CMS",
-			"headers": {
-				"X-Flow-Powered": "Flow/?(.+)?$\\;version:\\1"
-			},
-			"icon": "Neos.svg",
-			"implies": "PHP",
-			"website": "flow.neos.io"
-		},
-		"Neos CMS": {
-			"cats": [
-				1
-			],
-			"excludes": "TYPO3 CMS",
-			"headers": {
-				"X-Flow-Powered": "Neos/?(.+)?$\\;version:\\1"
-			},
-			"icon": "Neos.svg",
-			"implies": [
-				"PHP",
-				"Neos Flow"
-			],
-			"url": "/neos/",
-			"website": "neos.io"
-		},
 		"Taiga": {
 			"cats": [
 				13
@@ -9214,13 +9226,6 @@
 			"icon": "xui.png",
 			"script": "[^a-z]xui.*\\.js",
 			"website": "xuijs.com"
-		},
-		"Bubble": { 
-			"website": "bubble.is", 
-			"cats":  [ 1, 3, 18, 22 ], 
-			"env":  "^appquery$",
-			"implies": "Node.js",
-			"icon": "bubble.png"
 		}
 	},
 	"categories": {
@@ -9277,4 +9282,4 @@
 		"51": "Landing Page Builders",
 		"52": "Live Chat"
 	}
-}
+}

src/drivers/chrome/js/driver.js

@@ -216,7 +216,7 @@
 		 */
 		ping: function() {
 			if ( Object.keys(w.ping.hostnames).length && localStorage['tracking'] ) {
-				w.driver.post(w.config.websiteURL + 'ping/v2/', w.ping);
+				w.driver.post('http://ping.wappalyzer.com/ping/v2/', w.ping);
 
 				w.log('w.driver.ping: ' + JSON.stringify(w.ping));
 

src/drivers/chrome/manifest.json

@@ -1,7 +1,7 @@
 { "name": "Wappalyzer",
 	"homepage_url": "https://wappalyzer.com?pk_campaign=chrome&pk_kwd=context",
 	"description": "Identifies software on the web",
-	"version": "2.48",
+	"version": "2.49",
 	"default_locale": "en",
 	"manifest_version": 2,
 	"icons": {

src/drivers/firefox/driver.js

@@ -448,13 +448,13 @@
 					}).post();
 				};
 
-				post(w.config.websiteURL + 'ping/v2/', w.ping);
+				post('http://ping.wappalyzer.com/ping/v2/', w.ping);
 
 				w.log('w.driver.ping: ' + JSON.stringify(w.ping));
 
 				w.ping = { hostnames: {} };
 
-				post('http://ad.wappalyzer.com/log/wp/', w.adCache);
+				post('https://ad.wappalyzer.com/log/wp/', w.adCache);
 
 				w.adCache = [];
 			}

src/drivers/firefox/package.json

@@ -8,7 +8,7 @@
   "description": "Identifies software on the web",
   "author": "Elbert Alias",
   "license": "GPLv3",
-  "version": "3.2.6",
+  "version": "3.2.7",
 	"main": "driver.js",
 	"preferences": [{
 		"name": "tracking",

src/icons/Neos.svg

@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg width="100%" height="100%" viewBox="0 0 200 200" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41421;"><g><path d="M132.984,37.5l-20.642,15.162l0,31.716l20.642,29.413l0,-76.291Z" style="fill:#26224c;fill-rule:nonzero;"/><path d="M132.984,150.565l-79.357,-113.065l-9.193,6.773l0,118.227l20.642,-15.162l0,-58.548l51.619,73.71l22.58,0l16.291,-11.935l-22.582,0Z" style="fill:#26224c;fill-rule:nonzero;"/><path d="M65.076,88.79l0,58.548l-20.642,15.162l22.582,0l20.642,-15.162l0,-26.3l-22.582,-32.248Z" style="fill:#00adee;fill-rule:nonzero;"/><path d="M132.984,113.791l0,-76.291l22.582,0l0,113.065l-22.582,0l-79.357,-113.065l25.809,0l53.548,76.291Z" style="fill:#00adee;fill-rule:nonzero;"/></g></svg>
+<svg viewBox="0 0 200 200" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414"><g fill-rule="nonzero"><path d="M132.984 37.5l-20.642 15.162v31.716l20.642 29.413V37.5zm0 113.065L53.627 37.5l-9.193 6.773V162.5l20.642-15.162V88.79l51.619 73.71h22.58l16.291-11.935h-22.582z" fill="#26224c"/><path d="M65.076 88.79v58.548L44.434 162.5h22.582l20.642-15.162v-26.3L65.076 88.79zm67.908 25.001V37.5h22.582v113.065h-22.582L53.627 37.5h25.809l53.548 76.291z" fill="#00adee"/></g></svg>

src/icons/Sitefinity.svg

@@ -1 +1 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 748.97 800"><defs><style>.cls-1{fill:#5ce500;}</style></defs><title>Progress_symbol_primary_RGB</title><path class="cls-1" d="M540.9,764V331.55L166.46,115.36l194.14-112c7.66-4.42,20.23-4.42,27.89,0L749,211.45v416.3c0,8.86-6.27,19.72-13.95,24.13Zm-97.23-64c7.67-4.43,14-15.29,14-24.16V379.57L201.17,231.49c-7.66-4.44-20.2-4.44-27.87,0L0,331.55,270.45,487.7V800ZM0,643.85L187.13,751.93V535.71Z"/></svg>
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 748.97 800"><defs><style>.cls-1{fill:#5ce500}</style></defs><title>Progress_symbol_primary_RGB</title><path class="cls-1" d="M540.9 764V331.55L166.46 115.36l194.14-112c7.66-4.42 20.23-4.42 27.89 0L749 211.45v416.3c0 8.86-6.27 19.72-13.95 24.13zm-97.23-64c7.67-4.43 14-15.29 14-24.16V379.57l-256.5-148.08c-7.66-4.44-20.2-4.44-27.87 0L0 331.55 270.45 487.7V800zM0 643.85l187.13 108.08V535.71z"/></svg>