tweaking, reduce build times

docker/elasticpot/Dockerfile

@@ -25,6 +25,7 @@ RUN apk -U --no-cache add \
 	     py3-setuptools \
 	     py3-pip \
 	     py3-twisted \
+	     py3-wheel \
              python3 \
              python3-dev && \
     mkdir -p /opt && \

docker/ews/Dockerfile

@@ -20,7 +20,8 @@ RUN apk -U --no-cache add \
 	    py3-openssl \
             py3-requests \
 	    py3-pip \
-            py3-setuptools && \
+            py3-setuptools \
+            py3-wheel && \
     pip3 install --upgrade pip && \
     pip3 install --no-cache-dir configparser hpfeeds3 influxdb influxdb-client xmljson && \
 #

docker/heralding/Dockerfile

@@ -23,6 +23,7 @@ RUN apk -U --no-cache add \
 			py3-requests \
 			py3-rsa \
 			py3-typing-extensions \
+			py3-wheel \
 			py3-yaml \
             		python3 \
             		python3-dev && \

docker/honeytrap/docker-compose.yml

@@ -9,8 +9,8 @@ services:
     restart: always
     tmpfs:
      - /tmp/honeytrap:uid=2000,gid=2000
-    cpu_count: 1
+#    cpu_count: 1
-    cpus: 0.75
+#    cpus: 0.75
     network_mode: "host"
     cap_add:
      - NET_ADMIN

docker/ipphoney/Dockerfile

@@ -14,9 +14,20 @@ RUN apk -U --no-cache add \
              openssl-dev \
 	     postgresql-dev \
 	     py3-cryptography \
+	     py3-elasticsearch \
+	     py3-geoip2 \
+	     py3-maxminddb \
              py3-mysqlclient \
              py3-requests \
+	     py3-packaging \
 	     py3-pip \
+	     py3-psycopg2 \
+	     py3-redis \
+	     py3-requests \
+	     py3-service_identity \
+	     py3-setuptools \
+	     py3-twisted \
+	     py3-wheel \
              python3 \
              python3-dev && \
     mkdir -p /opt && \
@@ -24,7 +35,7 @@ RUN apk -U --no-cache add \
     git clone https://gitlab.com/bontchev/ipphoney.git/ && \
     cd ipphoney && \
     git checkout 7ab1cac437baba17cb2cd25d5bb1400327e1bb79 && \
-    pip3 install --ignore-installed packaging && \
+    cp /root/dist/requirements.txt . && \
     pip3 install -r requirements.txt && \
     setcap cap_net_bind_service=+ep /usr/bin/python3.9 && \
 #

docker/ipphoney/dist/requirements.txt

@@ -0,0 +1,4 @@
+configparser>=3.5.0
+couchdb
+hpfeeds>=3.0.0
+pymongo

docker/ipphoney/docker-compose.yml

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

docker/log4pot/docker-compose.yml

@@ -12,8 +12,8 @@ services:
     restart: always
     tmpfs:
      - /tmp:uid=2000,gid=2000
-    cpu_count: 1
+#    cpu_count: 1
-    cpus: 0.25
+#    cpus: 0.25
     networks:
      - log4pot_local
     ports:

docker/mailoney/docker-compose.yml

@@ -16,8 +16,8 @@ services:
      - HPFEEDS_SECRET=pass
      - HPFEEDS_PORT=20000
      - HPFEEDS_CHANNELPREFIX=prefix
-    cpu_count: 1
+#    cpu_count: 1
-    cpus: 0.25
+#    cpus: 0.25
     networks:
      - mailoney_local
     ports:

docker/medpot/docker-compose.yml

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

docker/nginx/docker-compose.yml

@@ -15,8 +15,8 @@ services:
      - /var/tmp/nginx/scgi
      - /run
      - /var/lib/nginx/tmp:uid=100,gid=82
-    cpu_count: 1
+#    cpu_count: 1
-    cpus: 0.75
+#    cpus: 0.75
     network_mode: "host"
     ports:
      - "64297:64297"

docker/p0f/docker-compose.yml

@@ -7,8 +7,8 @@ services:
     build: .
     container_name: p0f
     restart: always
-    cpu_count: 1
+#    cpu_count: 1
-    cpus: 0.75
+#    cpus: 0.75
     network_mode: "host"
     image: "dtagdevsec/p0f:2203"
     read_only: true

docker/redishoneypot/docker-compose.yml

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

docker/sentrypeer/docker-compose.yml

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

docker/spiderfoot/Dockerfile

@@ -1,5 +1,8 @@
 FROM alpine:3.15
 #
+# Include dist
+COPY dist/ /root/dist/
+#
 # Get and install dependencies & packages
 RUN apk -U --no-cache add \
             build-base \
@@ -18,7 +21,31 @@ RUN apk -U --no-cache add \
             openssl-dev \
             python3 \
             python3-dev \
+	    py3-cryptography \
+	    py3-ipaddr \
+	    py3-beautifulsoup4 \
+	    py3-dnspython \
+	    py3-exifread \
+	    py3-future \
+	    py3-jaraco.classes \
+	    py3-jaraco.context \
+	    py3-jaraco.functools \
+	    py3-lxml \
+	    py3-mako \
+	    py3-more-itertools \
+	    py3-netaddr \
+	    py3-networkx \
+	    py3-openssl \
+	    py3-pillow \
+	    py3-portend \
+	    py3-pypdf2 \
+	    py3-phonenumbers \
             py3-pip \
+	    py3-pysocks \
+	    py3-requests \
+	    py3-tempora \
+	    py3-wheel \
+	    py3-xlsxwriter \
             swig \
 	    tinyxml \
 	    tinyxml-dev \
@@ -32,7 +59,7 @@ RUN apk -U --no-cache add \
     git clone --depth=1 -b v3.5 https://github.com/smicallef/spiderfoot /home/spiderfoot && \
     cd /home/spiderfoot && \
     pip3 install --upgrade pip && \
-    pip3 install --no-cache-dir wheel && \ 
+    cp /root/dist/requirements.txt . && \
     pip3 install --no-cache-dir -r requirements.txt && \ 
     mkdir -p /home/spiderfoot/.spiderfoot/logs && \
     chown -R spiderfoot:spiderfoot /home/spiderfoot && \

docker/spiderfoot/dist/requirements.txt

@@ -0,0 +1,11 @@
+adblockparser>=0.7,<1
+CherryPy>=18.6.1,<19
+cherrypy-cors>=1.6,<2
+ipwhois>=1.1.0,<1.2.0
+pygexf>=0.2.2,<0.3
+python-whois>=0.7.3,<0.8
+secure>=0.3.0,<0.4.0
+python-docx>=0.8.11,<0.9
+python-pptx>=0.6.21,<0.7
+publicsuffixlist>=0.7.9,<0.8
+openpyxl>=3.0.9,<4

docker/spiderfoot/docker-compose.yml

@@ -10,8 +10,8 @@ services:
     build: .
     container_name: spiderfoot
     restart: always
-    cpu_count: 1
+#    cpu_count: 1
-    cpus: 0.75
+#    cpus: 0.75
     networks:
      - spiderfoot_local
     ports:

docker/tanner/docker-compose.yml

@@ -12,8 +12,8 @@ services:
     restart: always
     stop_signal: SIGKILL
     tty: true
-    cpu_count: 1
+#    cpu_count: 1
-    cpus: 0.25
+#    cpus: 0.25
     networks:
      - tanner_local
     image: "dtagdevsec/redis:2203"
@@ -28,8 +28,8 @@ services:
     tmpfs:
      - /tmp:uid=2000,gid=2000
     tty: true
-    cpu_count: 1
+#    cpu_count: 1
-    cpus: 0.25
+#    cpus: 0.25
     networks:
      - tanner_local
     image: "dtagdevsec/phpox:2203"
@@ -44,8 +44,8 @@ services:
     tmpfs:
      - /tmp/tanner:uid=2000,gid=2000
     tty: true
-    cpu_count: 1
+#    cpu_count: 1
-    cpus: 0.25
+#    cpus: 0.25
     networks:
      - tanner_local
     image: "dtagdevsec/tanner:2203"
@@ -86,8 +86,8 @@ services:
     tmpfs:
      - /tmp/tanner:uid=2000,gid=2000
     tty: true
-    cpu_count: 1
+#    cpu_count: 1
-    cpus: 0.25
+#    cpus: 0.25
     networks:
      - tanner_local
     image: "dtagdevsec/tanner:2203"
@@ -108,8 +108,8 @@ services:
     restart: always
     stop_signal: SIGKILL
     tty: true
-    cpu_count: 1
+#    cpu_count: 1
-    cpus: 0.25
+#    cpus: 0.25
     networks:
      - tanner_local
     ports: