reduce build times, tweaking

docker/tanner/phpox/Dockerfile

@@ -8,7 +8,7 @@ RUN apk -U --no-cache add \
                make \
                php7 \
                php7-dev \
-	       py3-pip \
+	       py3-aiohttp \
                python3 \
                python3-dev \
                re2c && \
@@ -31,7 +31,6 @@ RUN apk -U --no-cache add \
     git clone https://github.com/mushorg/phpox /opt/phpox && \
     cd /opt/phpox && \
     git checkout a62c8136ec7b3ebab0c989f4235e2960175121f8 && \
-    pip3 install -r requirements.txt && \
     make && \
 #
 # Clean up

docker/tanner/snare/Dockerfile

@@ -9,14 +9,21 @@ RUN apk -U --no-cache add \
                git \
                linux-headers \
                python3 \
-               python3-dev \ 
+               python3-dev \
-               py3-pip && \ 
+	       py3-aiohttp \
+	       py3-beautifulsoup4 \
+	       py3-gitpython \
+	       py3-markupsafe \
+	       py3-setuptools \
+               py3-pip \
+	       py3-pycodestyle \
+	       py3-wheel && \
 #
 # Setup Snare 
     git clone https://github.com/mushorg/snare /opt/snare && \
     cd /opt/snare/ && \
     git checkout 0919a80838eb0823a3b7029b0264628ee0a36211 && \
-    pip3 install --no-cache-dir setuptools && \
+    cp /root/dist/requirements.txt . && \
     pip3 install --no-cache-dir -r requirements.txt && \
     python3 setup.py install && \
     cd / && \

docker/tanner/snare/dist/requirements.txt

@@ -0,0 +1,2 @@
+aiohttp_jinja2==1.1.0
+cssutils==1.0.2

docker/tanner/tanner/Dockerfile

@@ -11,7 +11,21 @@ RUN apk -U --no-cache add \
                libffi-dev \
                openssl-dev \
                linux-headers \
+	       py3-aiohttp \
+	       py3-geoip2 \
+	       py3-jinja2 \
+	       py3-jwt \
+	       py3-mako \
+	       py3-mysqlclient \
+	       py3-packaging \
 	       py3-pip \
+	       py3-redis \
+	       py3-pycodestyle \
+	       py3-setuptools \
+	       py3-tornado \
+	       py3-websocket-client \
+	       py3-wheel \
+	       py3-yaml \
                py3-yarl \
                python3 \
                python3-dev && \ 
@@ -26,8 +40,7 @@ RUN apk -U --no-cache add \
 #    sed -i 's/aioredis/aioredis==1.3.1/g' requirements.txt && \
 #    sed -i 's/^aiohttp$/aiohttp==3.7.4/g' requirements.txt && \
     cp /root/dist/config.yaml /opt/tanner/tanner/data && \
-    pip3 install --ignore-installed packaging && \
+    cp /root/dist/requirements.txt . && \
-    pip3 install --no-cache-dir setuptools && \
     pip3 install --no-cache-dir -r requirements.txt && \
     python3 setup.py install && \
     rm -rf .coveragerc \

docker/tanner/tanner/dist/requirements.txt

@@ -0,0 +1,8 @@
+aiomysql
+aiohttp_jinja2==1.1.0
+docker<2.6
+mimesis<3.0.0
+aioredis
+pymongo
+pylibinjection
+aiodocker

docker/wordpot/Dockerfile

@@ -1,13 +1,20 @@
 FROM alpine:3.15
 #
 # Include dist
-#COPY dist/ /root/dist/
+COPY dist/ /root/dist/
+#
 # Install packages
 RUN apk -U --no-cache add \
              build-base \
              git \
 	     libcap \
+	     py3-click \
+	     py3-flask \
+	     py3-itsdangerous \
+	     py3-jinja2 \
+	     py3-markupsafe \
 	     py3-pip \
+	     py3-werkzeug \
              python3 \
              python3-dev && \
 #	     
@@ -17,8 +24,8 @@ RUN apk -U --no-cache add \
     git clone https://github.com/Will-777/wordpot2 && \
     cd wordpot2 && \
     git checkout e93a2e00d84d280b0acd58ba6889b4bee8a6e4d2 && \
-    sed "s/MarkupSafe==1.0/MarkupSafe==1.1.1/g" -i requirements.txt && \
 #    cp /root/dist/views.py /opt/wordpot2/wordpot/views.py && \
+    cp /root/dist/requirements.txt . && \
     pip3 install -r requirements.txt && \
     setcap cap_net_bind_service=+ep /usr/bin/python3.9 && \
 #

docker/wordpot/dist/requirements.txt

@@ -0,0 +1 @@
+hpfeeds-threatstream==1.1

docker/wordpot/docker-compose.yml

@@ -10,8 +10,8 @@ services:
     build: .
     container_name: wordpot
     restart: always
-    cpu_count: 1
+#    cpu_count: 1
-    cpus: 0.25
+#    cpus: 0.25
     networks:
      - wordpot_local
     ports: