From 3d259bbc344f864da3e2b793853bb25698eeb962 Mon Sep 17 00:00:00 2001
From: t3chn0m4g3 <t3chn0m4g3@gmail.com>
Date: Wed, 8 Aug 2018 11:49:32 +0000
Subject: [PATCH] tanner finetuning

---
 docker/tanner/tanner/Dockerfile            | 17 ++++++++++++++++-
 docker/tanner/tanner/dist/config.py        |  8 ++++++--
 docker/tanner/tanner/dist/requirements.txt | 14 --------------
 3 files changed, 22 insertions(+), 17 deletions(-)
 delete mode 100644 docker/tanner/tanner/dist/requirements.txt

diff --git a/docker/tanner/tanner/Dockerfile b/docker/tanner/tanner/Dockerfile
index 20a2434b..c15be02f 100644
--- a/docker/tanner/tanner/Dockerfile
+++ b/docker/tanner/tanner/Dockerfile
@@ -18,11 +18,22 @@ RUN apk -U --no-cache add \
 # Setup Tanner
     git clone --depth=1 https://github.com/mushorg/tanner /opt/tanner && \
     cp /root/dist/config.py /opt/tanner/tanner/ && \
-    cp /root/dist/requirements.txt /opt/tanner/ && \
     cd /opt/tanner/ && \
     pip3 install --no-cache-dir --upgrade pip setuptools && \
     pip3 install --no-cache-dir -r requirements.txt && \
     python3 setup.py install && \
+    rm -rf .coveragerc \
+           .git \
+           .gitignore \
+           .travis.yml \
+           Tanner.egg-info \
+           build \
+           dist \
+           docker \
+           docs \
+           requirements.txt \
+           setup.py \
+           tanner/data && \
     cd / && \
     
 # Setup configs, user, groups
@@ -34,6 +45,10 @@ RUN apk -U --no-cache add \
 # Clean up
     apk del --purge \
             build-base \
+            git \
+            libcap \
+            libffi-dev \
+            libressl-dev \
             linux-headers \
             python3-dev && \
     rm -rf /root/* && \
diff --git a/docker/tanner/tanner/dist/config.py b/docker/tanner/tanner/dist/config.py
index 9979aa4f..37f64220 100644
--- a/docker/tanner/tanner/dist/config.py
+++ b/docker/tanner/tanner/dist/config.py
@@ -5,8 +5,12 @@ import sys
 
 LOGGER = logging.getLogger(__name__)
 
-config_template = {'DATA': {'db_config': '/opt/tanner/db/db_config.json', 'dorks': '/opt/tanner/data/dorks.pickle',
-                            'user_dorks': '/opt/tanner/data/user_dorks.pickle'},
+config_template = {'DATA': {'db_config': '/opt/tanner/db/db_config.json',
+                            'dorks': '/opt/tanner/data/dorks.pickle',
+                            'user_dorks': '/opt/tanner/data/user_dorks.pickle',
+                            'crawler_stats': '/opt/tanner/data/crawler_user_agents.txt',
+                            'geo_db': '/opt/tanner/db/GeoLite2-City.mmdb'
+                            },                            
                    'TANNER': {'host': '0.0.0.0', 'port': 8090},
                    'WEB': {'host': '0.0.0.0', 'port': 8091},
                    'API': {'host': '0.0.0.0', 'port': 8092},
diff --git a/docker/tanner/tanner/dist/requirements.txt b/docker/tanner/tanner/dist/requirements.txt
deleted file mode 100644
index 76bc2b0d..00000000
--- a/docker/tanner/tanner/dist/requirements.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-aiohttp
-aiomysql
-aiohttp_jinja2==0.14.0
-docker<2.6
-mimesis
-yarl
-redis
-aioredis
-uvloop
-pymongo
-pylibinjection
-jinja2
-pycodestyle
-geoip2