From 57adc324d86216bb4fbe5927a7f512296e4c57b6 Mon Sep 17 00:00:00 2001 From: DaAwesomeP Date: Sat, 26 Sep 2015 18:26:48 -0500 Subject: [PATCH 1/5] Compress icons, use new NodeJS, remove Travis sudo --- .travis.yml | 8 ++------ bin/wappalyzer-build | 4 ++++ docker/Dockerfile | 7 ++++--- 3 files changed, 10 insertions(+), 9 deletions(-) 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 From 89bac15d5087dc8016c1dc5cc72e0b68d5a9ba94 Mon Sep 17 00:00:00 2001 From: DaAwesomeP Date: Sat, 26 Sep 2015 18:32:02 -0500 Subject: [PATCH 2/5] Upgrade to new Travis --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 5cd23ac6d..62527435c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ language: node_js node_js: - "0.12" +sudo: false before_install: - export WAPPALYZER_ROOT=$TRAVIS_BUILD_DIR - export WAPPALYZER_NODE_PATH=$TRAVIS_BUILD_DIR From ce69382111085a5cd7355eedb8fab4e826fbad8c Mon Sep 17 00:00:00 2001 From: DaAwesomeP Date: Sat, 26 Sep 2015 18:32:02 -0500 Subject: [PATCH 3/5] Upgrade to new Travis --- .travis.yml | 1 + bin/wappalyzer-build | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5cd23ac6d..62527435c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ language: node_js node_js: - "0.12" +sudo: false before_install: - export WAPPALYZER_ROOT=$TRAVIS_BUILD_DIR - export WAPPALYZER_NODE_PATH=$TRAVIS_BUILD_DIR diff --git a/bin/wappalyzer-build b/bin/wappalyzer-build index b1f8db04b..5aedbf510 100755 --- a/bin/wappalyzer-build +++ b/bin/wappalyzer-build @@ -17,7 +17,7 @@ jsonlint -ist $'\t' $WAPPALYZER_ROOT/src/apps.json echo "Compressing icons..." -imagemin-cli $WAPPALYZER_ROOT/src/icons $WAPPALYZER_ROOT/src/icons -o 3 +imagemin $WAPPALYZER_ROOT/src/icons $WAPPALYZER_ROOT/src/icons -o 3 wappalyzer links From af012384ad9929557f89103a466bd6c186b00e7c Mon Sep 17 00:00:00 2001 From: DaAwesomeP Date: Sat, 26 Sep 2015 18:38:58 -0500 Subject: [PATCH 4/5] Remove 'node' link in Dockerfile --- docker/Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 09fe180ad..142804515 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -13,8 +13,6 @@ 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 From 45558235368a8507787e0fc27e01dff50deeb1fe Mon Sep 17 00:00:00 2001 From: DaAwesomeP Date: Sat, 26 Sep 2015 18:49:31 -0500 Subject: [PATCH 5/5] Update .gitignore --- .gitignore | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 36d3e091e..a8d724d9a 100644 --- a/.gitignore +++ b/.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