diff --git a/docker/glastopf/Dockerfile b/docker/deprecated/glastopf/Dockerfile similarity index 100% rename from docker/glastopf/Dockerfile rename to docker/deprecated/glastopf/Dockerfile diff --git a/docker/glastopf/README.md b/docker/deprecated/glastopf/README.md similarity index 100% rename from docker/glastopf/README.md rename to docker/deprecated/glastopf/README.md diff --git a/docker/glastopf/dist/glastopf.cfg b/docker/deprecated/glastopf/dist/glastopf.cfg similarity index 100% rename from docker/glastopf/dist/glastopf.cfg rename to docker/deprecated/glastopf/dist/glastopf.cfg diff --git a/docker/glastopf/dist/requirements.txt b/docker/deprecated/glastopf/dist/requirements.txt similarity index 100% rename from docker/glastopf/dist/requirements.txt rename to docker/deprecated/glastopf/dist/requirements.txt diff --git a/docker/glastopf/doc/dashboard.png b/docker/deprecated/glastopf/doc/dashboard.png similarity index 100% rename from docker/glastopf/doc/dashboard.png rename to docker/deprecated/glastopf/doc/dashboard.png diff --git a/docker/glastopf/docker-compose.yml b/docker/deprecated/glastopf/docker-compose.yml similarity index 100% rename from docker/glastopf/docker-compose.yml rename to docker/deprecated/glastopf/docker-compose.yml diff --git a/docker/dionaea/docker-compose.yml b/docker/dionaea/docker-compose.yml index ac6218a1..052b1976 100644 --- a/docker/dionaea/docker-compose.yml +++ b/docker/dionaea/docker-compose.yml @@ -27,7 +27,7 @@ services: - "5060:5060/udp" - "5061:5061" - "27017:27017" - image: "dtagdevsec/dionaea:1903" + image: "dtagdevsec/dionaea:2006" read_only: true volumes: - /data/dionaea/roots/ftp:/opt/dionaea/var/dionaea/roots/ftp diff --git a/docker/elasticpot/Dockerfile b/docker/elasticpot/Dockerfile index 3e06caf8..e52055bb 100644 --- a/docker/elasticpot/Dockerfile +++ b/docker/elasticpot/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine +FROM alpine:latest # # Include dist ADD dist/ /root/dist/ diff --git a/docker/elasticpot/docker-compose.yml b/docker/elasticpot/docker-compose.yml index 5e336ee8..a8fd3547 100644 --- a/docker/elasticpot/docker-compose.yml +++ b/docker/elasticpot/docker-compose.yml @@ -14,7 +14,7 @@ services: - elasticpot_local ports: - "9200:9200" - image: "dtagdevsec/elasticpot:1903" + image: "dtagdevsec/elasticpot:2006" read_only: true volumes: - /data/elasticpot/log:/opt/ElasticpotPY/log diff --git a/docker/ews/Dockerfile b/docker/ews/Dockerfile index 87397ddb..acd4767d 100644 --- a/docker/ews/Dockerfile +++ b/docker/ews/Dockerfile @@ -1,10 +1,11 @@ -FROM alpine +FROM alpine:latest # # Include dist ADD dist/ /root/dist/ # # Install packages -RUN apk -U --no-cache add \ +RUN sed -i 's/dl-cdn/dl-2/g' /etc/apk/repositories && \ + apk -U --no-cache add \ build-base \ git \ libffi-dev \ @@ -46,4 +47,4 @@ RUN apk -U --no-cache add \ # Run ewsposter STOPSIGNAL SIGINT USER ews:ews -CMD sleep 10 && exec /usr/bin/python3 -u /opt/ewsposter/ews.py -l $(shuf -i 10-60 -n 1) +CMD sleep 10 && exec /usr/bin/python3 -u /opt/ewsposter/ews.py -l $(shuf -i 10-15 -n 1) diff --git a/docker/fatt/Dockerfile b/docker/fatt/Dockerfile index 387149c0..793679be 100644 --- a/docker/fatt/Dockerfile +++ b/docker/fatt/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine +FROM alpine:latest # # Include dist #ADD dist/ /root/dist/ diff --git a/docker/fatt/docker-compose.yml b/docker/fatt/docker-compose.yml index 75cbe6a6..1550ed3a 100644 --- a/docker/fatt/docker-compose.yml +++ b/docker/fatt/docker-compose.yml @@ -12,6 +12,6 @@ services: - NET_ADMIN - SYS_NICE - NET_RAW - image: "dtagdevsec/fatt:1903" + image: "dtagdevsec/fatt:2006" volumes: - /data/fatt/log:/opt/fatt/log diff --git a/docker/glutton/Dockerfile b/docker/glutton/Dockerfile index 38514bc6..34c51835 100644 --- a/docker/glutton/Dockerfile +++ b/docker/glutton/Dockerfile @@ -1,10 +1,11 @@ -FROM alpine +FROM alpine:latest # # Include dist ADD dist/ /root/dist/ # # Setup apk -RUN apk -U --no-cache add \ +RUN sed -i 's/dl-cdn/dl-2/g' /etc/apk/repositories && \ + apk -U --no-cache add \ build-base \ git \ go \ diff --git a/docker/glutton/docker-compose.yml b/docker/glutton/docker-compose.yml index 5377a6aa..68843e9d 100644 --- a/docker/glutton/docker-compose.yml +++ b/docker/glutton/docker-compose.yml @@ -13,7 +13,7 @@ services: network_mode: "host" cap_add: - NET_ADMIN - image: "dtagdevsec/glutton:1903" + image: "dtagdevsec/glutton:2006" read_only: true volumes: - /data/glutton/log:/var/log/glutton diff --git a/docker/heimdall/docker-compose.yml b/docker/heimdall/docker-compose.yml index 6fb399a3..98346f10 100644 --- a/docker/heimdall/docker-compose.yml +++ b/docker/heimdall/docker-compose.yml @@ -26,7 +26,7 @@ services: ports: - "64297:64297" - "127.0.0.1:64304:64304" - image: "dtagdevsec/nginx:1903" + image: "dtagdevsec/nginx:2006" read_only: true volumes: - /data/nginx/cert/:/etc/nginx/cert/:ro diff --git a/docker/honeypy/Dockerfile b/docker/honeypy/Dockerfile index b61c6886..80d95870 100644 --- a/docker/honeypy/Dockerfile +++ b/docker/honeypy/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine +FROM alpine:latest # # Include dist ADD dist/ /root/dist/ @@ -28,6 +28,7 @@ RUN sed -i 's/dl-cdn/dl-2/g' /etc/apk/repositories && \ sed -i 's/bytes/size/g' /opt/honeypy/loggers/file/honeypy_file.py && \ sed -i 's/date_time/timestamp/g' /opt/honeypy/loggers/file/honeypy_file.py && \ sed -i 's/data,/data.decode("hex"),/g' /opt/honeypy/loggers/file/honeypy_file.py && \ + sed -i 's/urllib3/urllib3 == 1.21.1/g' /opt/honeypy/requirements.txt && \ virtualenv env && \ cp /root/dist/services.cfg /opt/honeypy/etc && \ cp /root/dist/honeypy.cfg /opt/honeypy/etc && \ diff --git a/docker/honeypy/docker-compose.yml b/docker/honeypy/docker-compose.yml index 3550622a..dd12fa2d 100644 --- a/docker/honeypy/docker-compose.yml +++ b/docker/honeypy/docker-compose.yml @@ -20,7 +20,7 @@ services: - "2324:2324" - "4096:4096" - "9200:9200" - image: "dtagdevsec/honeypy:1903" + image: "dtagdevsec/honeypy:2006" read_only: true volumes: - /data/honeypy/log:/opt/honeypy/log diff --git a/docker/hpfeeds/Dockerfile b/docker/hpfeeds/Dockerfile index 57c078fe..b0743132 100644 --- a/docker/hpfeeds/Dockerfile +++ b/docker/hpfeeds/Dockerfile @@ -1,10 +1,11 @@ ### This is only for testing purposes, do NOT use for production -FROM alpine - +FROM alpine:latest +# ADD dist/ /root/dist/ - +# # Install packages -RUN apk -U --no-cache add \ +RUN sed -i 's/dl-cdn/dl-2/g' /etc/apk/repositories && \ + apk -U --no-cache add \ build-base \ coreutils \ git \ @@ -15,7 +16,7 @@ RUN apk -U --no-cache add \ python \ python-dev \ sqlite && \ - +# # Install php sandbox from git git clone --depth=1 https://github.com/rep/hpfeeds /opt/hpfeeds && \ cd /opt/hpfeeds/broker && \ @@ -23,10 +24,10 @@ RUN apk -U --no-cache add \ 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 \ @@ -35,7 +36,7 @@ RUN apk -U --no-cache add \ 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/etc/curator/actions.yml b/etc/curator/actions.yml index fe48bfb9..aaece424 100644 --- a/etc/curator/actions.yml +++ b/etc/curator/actions.yml @@ -16,11 +16,11 @@ actions: disable_action: False filters: - filtertype: pattern - kind: prefix - value: logstash- + kind: timestring + value: '%Y.%m.%d' - filtertype: age source: name direction: older timestring: '%Y.%m.%d' unit: days - unit_count: 90 + unit_count: 60