Merge pull request #969 from DaAwesomeP/master

Compress icons with build, use new Travis container, update NodeJS version

.gitignore

@@ -1,4 +1,3 @@
-
 .vagrant
 
 build/*
@@ -6,6 +5,11 @@ build/*
 drivers/npm/node_modules
 drivers/npm/npm-debug.log
 
+node_modules/
+
 Thumbs.db
+ehthumbs.db
+Desktop.ini
+$RECYCLE.BIN/
 
 !.gitkeep

.travis.yml

@@ -1,16 +1,13 @@
 language: node_js
 node_js:
-  - "0.10"
+  - "0.12"
-sudo: required
+sudo: false
 before_install:
   - export WAPPALYZER_ROOT=$TRAVIS_BUILD_DIR
   - export WAPPALYZER_NODE_PATH=$TRAVIS_BUILD_DIR
   - export PATH=$PATH:$TRAVIS_BUILD_DIR/bin
 install:
-  - sudo apt-get update -y
+  - npm install jsonlint jpm imagemin-cli -g
-  - sudo apt-get install -y curl zip sudo -y --force-yes
-  - sudo apt-get clean
-  - npm install jsonlint jpm -g
   - ln -s docker/node/package.json package.json && npm install
   - mkdir phantomjs && curl -L https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.8-linux-x86_64.tar.bz2 | tar xvjC phantomjs && ln -s $WAPPALYZER_ROOT/phantomjs/phantomjs-*-linux-x86_64/bin/phantomjs bin/phantomjs
 script: wappalyzer build

bin/wappalyzer-build

@@ -15,6 +15,10 @@ echo "Prettifying apps.json..."
 
 jsonlint -ist $'\t' $WAPPALYZER_ROOT/src/apps.json
 
+echo "Compressing icons..."
+
+imagemin $WAPPALYZER_ROOT/src/icons $WAPPALYZER_ROOT/src/icons -o 3
+
 wappalyzer links
 
 # Npm Module

docker/Dockerfile

@@ -7,13 +7,12 @@ ENV DEBIAN_FRONTEND noninteractive
 ENV WAPPALYZER_ROOT /home/wappalyzer/synced
 ENV WAPPALYZER_NODE_PATH /home/wappalyzer/node
 
-
 # Install packages
-RUN apt-get update && apt-get install -y curl nodejs npm zip libfreetype6 libfontconfig
+RUN apt-get update && apt-get install -y curl zip libfreetype6 libfontconfig
+RUN curl -sL https://deb.nodesource.com/setup_0.12 | bash -
+RUN apt-get install -y nodejs
 RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-RUN ln -s /usr/bin/nodejs /usr/bin/node
-
 
 # Add user
 RUN useradd -ms /bin/bash wappalyzer && usermod -a -G docker_env wappalyzer && echo "wappalyzer:wappalyzer" | chpasswd
@@ -33,7 +32,7 @@ RUN su wappalyzer -c "mkdir $WAPPALYZER_NODE_PATH"
 
 ADD node/package.json $WAPPALYZER_NODE_PATH/package.json
 
-RUN npm install jsonlint jpm -g && su wappalyzer -c "cd $WAPPALYZER_NODE_PATH && npm install"
+RUN npm install jsonlint jpm imagemin-cli -g && su wappalyzer -c "cd $WAPPALYZER_NODE_PATH && npm install"
 
 
 # PhantomJS