From bf7d1299ca214d3cb13caf6c45cafedf0b990e4e Mon Sep 17 00:00:00 2001 From: t3chn0m4g3 Date: Wed, 26 Feb 2020 14:22:48 +0000 Subject: [PATCH] tweaking --- docker/{ => deprecated}/hpfeeds/Dockerfile | 0 docker/deprecated/hpfeeds/Dockerfile.old | 42 +++++++++++++ .../{ => deprecated}/hpfeeds/dist/adduser.sql | 0 .../hpfeeds/docker-compose.yml | 0 docker/{ => deprecated}/nginx/Dockerfile | 2 +- .../nginx/dist/conf/nginx.conf | 0 .../nginx/dist/conf/ssl/dhparam4096.pem | 0 .../nginx/dist/conf/ssl/gen-cert.sh | 0 .../nginx/dist/conf/ssl/gen-dhparam.sh | 0 .../nginx/dist/conf/tpotweb.conf | 0 .../nginx/dist/html/error.html | 0 .../nginx/dist/html/favicon.ico | Bin .../nginx/dist/html/navbar.html | 0 .../nginx/dist/html/style.css | 0 .../nginx/dist/html/tpotweb.html | 0 .../{ => deprecated}/nginx/docker-compose.yml | 0 docker/honeypy/Dockerfile | 2 +- docker/mailoney/Dockerfile | 2 +- docker/medpot/Dockerfile | 2 +- docker/medpot/docker-compose.yml | 2 +- docker/p0f/Dockerfile | 2 +- docker/p0f/docker-compose.yml | 2 +- docker/rdpy/Dockerfile | 2 +- docker/rdpy/docker-compose.yml | 2 +- docker/spiderfoot/Dockerfile | 34 +++++++---- docker/spiderfoot/Dockerfile.old | 56 ++++++++++++++++++ docker/spiderfoot/docker-compose.yml | 2 +- docker/tanner/docker-compose.yml | 12 ++-- 28 files changed, 136 insertions(+), 28 deletions(-) rename docker/{ => deprecated}/hpfeeds/Dockerfile (100%) create mode 100644 docker/deprecated/hpfeeds/Dockerfile.old rename docker/{ => deprecated}/hpfeeds/dist/adduser.sql (100%) rename docker/{ => deprecated}/hpfeeds/docker-compose.yml (100%) rename docker/{ => deprecated}/nginx/Dockerfile (97%) rename docker/{ => deprecated}/nginx/dist/conf/nginx.conf (100%) rename docker/{ => deprecated}/nginx/dist/conf/ssl/dhparam4096.pem (100%) rename docker/{ => deprecated}/nginx/dist/conf/ssl/gen-cert.sh (100%) rename docker/{ => deprecated}/nginx/dist/conf/ssl/gen-dhparam.sh (100%) rename docker/{ => deprecated}/nginx/dist/conf/tpotweb.conf (100%) rename docker/{ => deprecated}/nginx/dist/html/error.html (100%) rename docker/{ => deprecated}/nginx/dist/html/favicon.ico (100%) rename docker/{ => deprecated}/nginx/dist/html/navbar.html (100%) rename docker/{ => deprecated}/nginx/dist/html/style.css (100%) rename docker/{ => deprecated}/nginx/dist/html/tpotweb.html (100%) rename docker/{ => deprecated}/nginx/docker-compose.yml (100%) create mode 100644 docker/spiderfoot/Dockerfile.old diff --git a/docker/hpfeeds/Dockerfile b/docker/deprecated/hpfeeds/Dockerfile similarity index 100% rename from docker/hpfeeds/Dockerfile rename to docker/deprecated/hpfeeds/Dockerfile diff --git a/docker/deprecated/hpfeeds/Dockerfile.old b/docker/deprecated/hpfeeds/Dockerfile.old new file mode 100644 index 00000000..b0743132 --- /dev/null +++ b/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 diff --git a/docker/hpfeeds/dist/adduser.sql b/docker/deprecated/hpfeeds/dist/adduser.sql similarity index 100% rename from docker/hpfeeds/dist/adduser.sql rename to docker/deprecated/hpfeeds/dist/adduser.sql diff --git a/docker/hpfeeds/docker-compose.yml b/docker/deprecated/hpfeeds/docker-compose.yml similarity index 100% rename from docker/hpfeeds/docker-compose.yml rename to docker/deprecated/hpfeeds/docker-compose.yml diff --git a/docker/nginx/Dockerfile b/docker/deprecated/nginx/Dockerfile similarity index 97% rename from docker/nginx/Dockerfile rename to docker/deprecated/nginx/Dockerfile index 1056490e..47696e7b 100644 --- a/docker/nginx/Dockerfile +++ b/docker/deprecated/nginx/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine +FROM alpine:latest # # Include dist ADD dist/ /root/dist/ diff --git a/docker/nginx/dist/conf/nginx.conf b/docker/deprecated/nginx/dist/conf/nginx.conf similarity index 100% rename from docker/nginx/dist/conf/nginx.conf rename to docker/deprecated/nginx/dist/conf/nginx.conf diff --git a/docker/nginx/dist/conf/ssl/dhparam4096.pem b/docker/deprecated/nginx/dist/conf/ssl/dhparam4096.pem similarity index 100% rename from docker/nginx/dist/conf/ssl/dhparam4096.pem rename to docker/deprecated/nginx/dist/conf/ssl/dhparam4096.pem diff --git a/docker/nginx/dist/conf/ssl/gen-cert.sh b/docker/deprecated/nginx/dist/conf/ssl/gen-cert.sh similarity index 100% rename from docker/nginx/dist/conf/ssl/gen-cert.sh rename to docker/deprecated/nginx/dist/conf/ssl/gen-cert.sh diff --git a/docker/nginx/dist/conf/ssl/gen-dhparam.sh b/docker/deprecated/nginx/dist/conf/ssl/gen-dhparam.sh similarity index 100% rename from docker/nginx/dist/conf/ssl/gen-dhparam.sh rename to docker/deprecated/nginx/dist/conf/ssl/gen-dhparam.sh diff --git a/docker/nginx/dist/conf/tpotweb.conf b/docker/deprecated/nginx/dist/conf/tpotweb.conf similarity index 100% rename from docker/nginx/dist/conf/tpotweb.conf rename to docker/deprecated/nginx/dist/conf/tpotweb.conf diff --git a/docker/nginx/dist/html/error.html b/docker/deprecated/nginx/dist/html/error.html similarity index 100% rename from docker/nginx/dist/html/error.html rename to docker/deprecated/nginx/dist/html/error.html diff --git a/docker/nginx/dist/html/favicon.ico b/docker/deprecated/nginx/dist/html/favicon.ico similarity index 100% rename from docker/nginx/dist/html/favicon.ico rename to docker/deprecated/nginx/dist/html/favicon.ico diff --git a/docker/nginx/dist/html/navbar.html b/docker/deprecated/nginx/dist/html/navbar.html similarity index 100% rename from docker/nginx/dist/html/navbar.html rename to docker/deprecated/nginx/dist/html/navbar.html diff --git a/docker/nginx/dist/html/style.css b/docker/deprecated/nginx/dist/html/style.css similarity index 100% rename from docker/nginx/dist/html/style.css rename to docker/deprecated/nginx/dist/html/style.css diff --git a/docker/nginx/dist/html/tpotweb.html b/docker/deprecated/nginx/dist/html/tpotweb.html similarity index 100% rename from docker/nginx/dist/html/tpotweb.html rename to docker/deprecated/nginx/dist/html/tpotweb.html diff --git a/docker/nginx/docker-compose.yml b/docker/deprecated/nginx/docker-compose.yml similarity index 100% rename from docker/nginx/docker-compose.yml rename to docker/deprecated/nginx/docker-compose.yml diff --git a/docker/honeypy/Dockerfile b/docker/honeypy/Dockerfile index 80d95870..3c07c6ac 100644 --- a/docker/honeypy/Dockerfile +++ b/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 \ diff --git a/docker/mailoney/Dockerfile b/docker/mailoney/Dockerfile index f23d24ea..c924714f 100644 --- a/docker/mailoney/Dockerfile +++ b/docker/mailoney/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine +FROM alpine:latest # # Install packages RUN apk -U --no-cache add \ diff --git a/docker/medpot/Dockerfile b/docker/medpot/Dockerfile index f530af8c..05ea54d6 100644 --- a/docker/medpot/Dockerfile +++ b/docker/medpot/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine +FROM alpine:latest # # Setup apk RUN apk -U --no-cache add \ diff --git a/docker/medpot/docker-compose.yml b/docker/medpot/docker-compose.yml index 6d147739..a5565475 100644 --- a/docker/medpot/docker-compose.yml +++ b/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 diff --git a/docker/p0f/Dockerfile b/docker/p0f/Dockerfile index 1c5b1f30..6568b41f 100644 --- a/docker/p0f/Dockerfile +++ b/docker/p0f/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine +FROM alpine:latest # # Add source ADD . /opt/p0f diff --git a/docker/p0f/docker-compose.yml b/docker/p0f/docker-compose.yml index 658ed924..0b1329b8 100644 --- a/docker/p0f/docker-compose.yml +++ b/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 diff --git a/docker/rdpy/Dockerfile b/docker/rdpy/Dockerfile index a671e1e0..a871b906 100644 --- a/docker/rdpy/Dockerfile +++ b/docker/rdpy/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine +FROM alpine:latest # # Include dist ADD dist/ /root/dist/ diff --git a/docker/rdpy/docker-compose.yml b/docker/rdpy/docker-compose.yml index 8f2da9a9..c991c270 100644 --- a/docker/rdpy/docker-compose.yml +++ b/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 diff --git a/docker/spiderfoot/Dockerfile b/docker/spiderfoot/Dockerfile index 4b1e4c8b..e95f8cd9 100644 --- a/docker/spiderfoot/Dockerfile +++ b/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"] diff --git a/docker/spiderfoot/Dockerfile.old b/docker/spiderfoot/Dockerfile.old new file mode 100644 index 00000000..86f0b0ea --- /dev/null +++ b/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"] diff --git a/docker/spiderfoot/docker-compose.yml b/docker/spiderfoot/docker-compose.yml index 475386ad..efc808c9 100644 --- a/docker/spiderfoot/docker-compose.yml +++ b/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 diff --git a/docker/tanner/docker-compose.yml b/docker/tanner/docker-compose.yml index 703946d3..01a007a9 100644 --- a/docker/tanner/docker-compose.yml +++ b/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