diff --git a/.travis.yml b/.travis.yml index d716a33ab..5cd23ac6d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,16 +1,12 @@ language: node_js node_js: - - "0.10" -sudo: required + - "0.12" 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 - - sudo apt-get install -y curl zip sudo -y --force-yes - - sudo apt-get clean - - npm install jsonlint jpm -g + - npm install jsonlint jpm imagemin-cli -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 diff --git a/bin/wappalyzer-build b/bin/wappalyzer-build index 0cbc8fe86..b1f8db04b 100755 --- a/bin/wappalyzer-build +++ b/bin/wappalyzer-build @@ -15,6 +15,10 @@ echo "Prettifying apps.json..." jsonlint -ist $'\t' $WAPPALYZER_ROOT/src/apps.json +echo "Compressing icons..." + +imagemin-cli $WAPPALYZER_ROOT/src/icons $WAPPALYZER_ROOT/src/icons -o 3 + wappalyzer links # Npm Module diff --git a/docker/Dockerfile b/docker/Dockerfile index 42c665280..09fe180ad 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -7,9 +7,10 @@ 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 @@ -33,7 +34,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