tweaking

docker/deprecated/hpfeeds/Dockerfile.old

@@ -0,0 +1,42 @@
+### This is only for testing purposes, do NOT use for production
+FROM alpine:latest
+#
+ADD dist/ /root/dist/
+#
+# Install packages
+RUN sed -i 's/dl-cdn/dl-2/g' /etc/apk/repositories && \
+    apk -U --no-cache add \
+               build-base \
+               coreutils \
+               git \
+               libffi \
+               libffi-dev \
+               py-gevent \
+               py-pip \
+               python \
+               python-dev \
+               sqlite && \
+#
+# Install php sandbox from git
+    git clone --depth=1 https://github.com/rep/hpfeeds /opt/hpfeeds && \
+    cd /opt/hpfeeds/broker && \
+    sed -i -e '87d;88d' database.py && \
+    cp /root/dist/adduser.sql . && \
+    cd /opt/hpfeeds/broker && timeout 5 python broker.py || : && \
+    sqlite3 db.sqlite3 < adduser.sql && \ 
+#    
+    #python setup.py build && \
+    #python setup.py install && \
+#
+# Clean up
+    apk del --purge autoconf \
+                    build-base \
+                    coreutils \
+                    libffi-dev \
+                    python-dev && \
+    rm -rf /root/* && \
+    rm -rf /var/cache/apk/*
+#
+# Set workdir and start glastopf
+WORKDIR /opt/hpfeeds/broker
+CMD python broker.py

docker/deprecated/nginx/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine
+FROM alpine:latest
 #
 # Include dist
 ADD dist/ /root/dist/

docker/honeypy/Dockerfile

@@ -38,7 +38,7 @@ RUN sed -i 's/dl-cdn/dl-2/g' /etc/apk/repositories && \
     addgroup -g 2000 honeypy && \
     adduser -S -H -s /bin/ash -u 2000 -D -g 2000 honeypy && \
     chown -R honeypy:honeypy /opt/honeypy && \
-    setcap cap_net_bind_service=+ep /opt/honeypy/env/bin/python2 && \
+    setcap cap_net_bind_service=+ep /opt/honeypy/env/bin/python && \
 #
 # Clean up
     apk del --purge build-base \

docker/mailoney/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine 
+FROM alpine:latest
 #
 # Install packages
 RUN apk -U --no-cache add \

docker/medpot/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine
+FROM alpine:latest
 #
 # Setup apk
 RUN apk -U --no-cache add \

docker/medpot/docker-compose.yml

@@ -14,7 +14,7 @@ services:
      - medpot_local
     ports:
      - "2575:2575"
-    image: "dtagdevsec/medpot:1903"
+    image: "dtagdevsec/medpot:2006"
     read_only: true
     volumes:
      - /data/medpot/log/:/var/log/medpot

docker/p0f/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine
+FROM alpine:latest
 #
 # Add source
 ADD . /opt/p0f

docker/p0f/docker-compose.yml

@@ -8,7 +8,7 @@ services:
     container_name: p0f
     restart: always
     network_mode: "host"
-    image: "dtagdevsec/p0f:1903"
+    image: "dtagdevsec/p0f:2006"
     read_only: true
     volumes:
      - /data/p0f/log:/var/log/p0f

docker/rdpy/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine
+FROM alpine:latest
 #
 # Include dist
 ADD dist/ /root/dist/

docker/rdpy/docker-compose.yml

@@ -22,7 +22,7 @@ services:
      - rdpy_local
     ports:
      - "3389:3389"
-    image: "dtagdevsec/rdpy:1903"
+    image: "dtagdevsec/rdpy:2006"
     read_only: true
     volumes:
      - /data/rdpy/log:/var/log/rdpy

docker/spiderfoot/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.10
+FROM alpine:latest
 #
 # Get and install dependencies & packages
 RUN sed -i 's/dl-cdn/dl-2/g' /etc/apk/repositories && \
@@ -6,45 +6,55 @@ RUN sed -i 's/dl-cdn/dl-2/g' /etc/apk/repositories && \
             build-base \
             curl \
             git \
+	    jpeg-dev \
 	    libffi-dev \
             libxml2 \
             libxml2-dev \
             libxslt \
             libxslt-dev \
+	    musl \
+	    musl-dev \
+	    openjpeg-dev \
             openssl \
             openssl-dev \
-            python \
-            python-dev \
+            python3 \
+            python3-dev \
 	    py-cffi \
 	    py-pillow \
             py-future \
-            py-pip \
-            swig && \
+            py3-pip \
+            swig \
+	    tinyxml \
+	    tinyxml-dev \
+	    zlib-dev && \
 #
 # Setup user
     addgroup -g 2000 spiderfoot && \
     adduser -S -s /bin/ash -u 2000 -D -g 2000 spiderfoot && \
 #
 # Install spiderfoot 
-#    git clone --depth=1 https://github.com/smicallef/spiderfoot -b v2.12.0-final /home/spiderfoot && \
     git clone --depth=1 https://github.com/smicallef/spiderfoot /home/spiderfoot && \
     cd /home/spiderfoot && \
-    pip install --no-cache-dir openxmllib wheel && \ 
-    pip install --no-cache-dir -r requirements.txt && \ 
+    pip3 install --no-cache-dir wheel && \ 
+    pip3 install --no-cache-dir -r requirements.txt && \ 
     chown -R spiderfoot:spiderfoot /home/spiderfoot && \
     sed -i "s#'__docroot': ''#'__docroot': '\/spiderfoot'#" /home/spiderfoot/sf.py && \
     sed -i 's#raise cherrypy.HTTPRedirect("\/")#raise cherrypy.HTTPRedirect("\/spiderfoot")#' /home/spiderfoot/sfwebui.py && \
 #
 # Clean up
     apk del --purge build-base \
+                    curl \
+                    gcc \
                     git \
 		    libffi-dev \
                     libxml2-dev \
                     libxslt-dev \
+		    musl-dev \
                     openssl-dev \
-                    python-dev \
-                    py-pip \
-                    py-setuptools && \
+                    python3-dev \
+                    py3-pip \
+		    swig \
+		    tinyxml-dev && \
     rm -rf /var/cache/apk/*
 #
 # Healthcheck
@@ -53,4 +63,4 @@ HEALTHCHECK --retries=10 CMD curl -s -XGET 'http://127.0.0.1:8080'
 # Set user, workdir and start spiderfoot
 USER spiderfoot:spiderfoot
 WORKDIR /home/spiderfoot
-CMD ["/usr/bin/python", "sf.py", "0.0.0.0:8080"]
+CMD ["/usr/bin/python3.8", "sf.py","-l", "0.0.0.0:8080"]

docker/spiderfoot/Dockerfile.old

@@ -0,0 +1,56 @@
+FROM alpine:latest
+#
+# Get and install dependencies & packages
+RUN sed -i 's/dl-cdn/dl-2/g' /etc/apk/repositories && \
+    apk -U --no-cache add \
+            build-base \
+            curl \
+            git \
+	    libffi-dev \
+            libxml2 \
+            libxml2-dev \
+            libxslt \
+            libxslt-dev \
+            openssl \
+            openssl-dev \
+            python \
+            python-dev \
+	    py-cffi \
+	    py-pillow \
+            py-future \
+            py-pip \
+            swig && \
+#
+# Setup user
+    addgroup -g 2000 spiderfoot && \
+    adduser -S -s /bin/ash -u 2000 -D -g 2000 spiderfoot && \
+#
+# Install spiderfoot 
+#    git clone --depth=1 https://github.com/smicallef/spiderfoot -b v2.12.0-final /home/spiderfoot && \
+    git clone --depth=1 https://github.com/smicallef/spiderfoot /home/spiderfoot && \
+    cd /home/spiderfoot && \
+    pip install --no-cache-dir openxmllib wheel && \ 
+    pip install --no-cache-dir -r requirements.txt && \ 
+    chown -R spiderfoot:spiderfoot /home/spiderfoot && \
+    sed -i "s#'__docroot': ''#'__docroot': '\/spiderfoot'#" /home/spiderfoot/sf.py && \
+    sed -i 's#raise cherrypy.HTTPRedirect("\/")#raise cherrypy.HTTPRedirect("\/spiderfoot")#' /home/spiderfoot/sfwebui.py && \
+#
+# Clean up
+    apk del --purge build-base \
+                    git \
+		    libffi-dev \
+                    libxml2-dev \
+                    libxslt-dev \
+                    openssl-dev \
+                    python-dev \
+                    py-pip \
+                    py-setuptools && \
+    rm -rf /var/cache/apk/*
+#
+# Healthcheck
+HEALTHCHECK --retries=10 CMD curl -s -XGET 'http://127.0.0.1:8080'
+#
+# Set user, workdir and start spiderfoot
+USER spiderfoot:spiderfoot
+WORKDIR /home/spiderfoot
+CMD ["/usr/bin/python", "sf.py", "0.0.0.0:8080"]

docker/spiderfoot/docker-compose.yml

@@ -14,6 +14,6 @@ services:
      - spiderfoot_local
     ports:
      - "127.0.0.1:64303:8080"
-    image: "dtagdevsec/spiderfoot:1903"
+    image: "dtagdevsec/spiderfoot:2006"
     volumes:
      - /data/spiderfoot/spiderfoot.db:/home/spiderfoot/spiderfoot.db

docker/tanner/docker-compose.yml

@@ -14,7 +14,7 @@ services:
     tty: true
     networks:
      - tanner_local
-    image: "dtagdevsec/redis:1903"
+    image: "dtagdevsec/redis:2006"
     read_only: true
 
 # PHP Sandbox service
@@ -26,7 +26,7 @@ services:
     tty: true
     networks:
      - tanner_local
-    image: "dtagdevsec/phpox:1903"
+    image: "dtagdevsec/phpox:2006"
     read_only: true
 
 # Tanner API Service
@@ -40,7 +40,7 @@ services:
     tty: true
     networks:
      - tanner_local
-    image: "dtagdevsec/tanner:1903"
+    image: "dtagdevsec/tanner:2006"
     read_only: true
     volumes:
      - /data/tanner/log:/var/log/tanner
@@ -59,7 +59,7 @@ services:
     tty: true
     networks:
      - tanner_local
-    image: "dtagdevsec/tanner:1903"
+    image: "dtagdevsec/tanner:2006"
     command: tannerweb
     read_only: true
     volumes:
@@ -78,7 +78,7 @@ services:
     tty: true
     networks:
      - tanner_local
-    image: "dtagdevsec/tanner:1903"
+    image: "dtagdevsec/tanner:2006"
     command: tanner
     read_only: true
     volumes:
@@ -100,6 +100,6 @@ services:
      - tanner_local
     ports:
      - "80:80"
-    image: "dtagdevsec/snare:1903"
+    image: "dtagdevsec/snare:2006"
     depends_on:
      - tanner