diff --git a/.env b/.env index 10123c403..561069055 100644 --- a/.env +++ b/.env @@ -108,7 +108,7 @@ TPOT_DOCKER_COMPOSE=./docker-compose.yml TPOT_REPO=dtagdevsec # T-Pot Version Tag -TPOT_VERSION=alpha +TPOT_VERSION=24.04 # T-Pot Pull Policy # always: (T-Pot default) Compose implementations SHOULD always pull the image from the registry. diff --git a/README.md b/README.md index bf44441a4..99aec0809 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ T-Pot is the all in one, optionally distributed, multiarch (amd64, arm64) honeyp 4. Install `curl`: `$ sudo [apt, dnf, zypper] install curl` if not installed already 5. Run installer as non-root from `$HOME`: ``` -env bash -c "$(curl -sL https://github.com/telekom-security/tpotce/raw/alpha/install.sh)" +env bash -c "$(curl -sL https://github.com/telekom-security/tpotce/raw/24.04/install.sh)" ``` * Follow instructions, read messages, check for possible port conflicts and reboot @@ -326,7 +326,7 @@ Choose a supported distro of your choice. It is recommended to use the minimum / Sometimes it is just nice if you can spin up a T-Pot instance on macOS or Windows, i.e. for development, testing or just the fun of it. As Docker Desktop is rather limited not all honeypot types or T-Pot features are supported. Also remember, by default the macOS and Windows firewall are blocking access from remote, so testing is limited to the host. For production it is recommended to run T-Pot on [Linux](#choose-your-distro).
To get things up and running just follow these steps: 1. Install Docker Desktop for [macOS](https://docs.docker.com/desktop/install/mac-install/) or [Windows](https://docs.docker.com/desktop/install/windows-install/). -2. Clone the GitHub repository: `git clone https://github.com/telekom-security/tpotce -b alpha`. +2. Clone the GitHub repository: `git clone https://github.com/telekom-security/tpotce -b 24.04`. 3. Go to: `cd ~/tpotce` 4. Copy `cp compose/mac_win.yml ./docker-compose.yml`. 5. Create a `WEB_USER` by running `~/tpotce/genuser.sh` diff --git a/docker/adbhoney/docker-compose.yml b/docker/adbhoney/docker-compose.yml index 0fb250c97..d726e6857 100644 --- a/docker/adbhoney/docker-compose.yml +++ b/docker/adbhoney/docker-compose.yml @@ -16,7 +16,7 @@ services: - adbhoney_local ports: - "5555:5555" - image: "dtagdevsec/adbhoney:alpha" + image: "dtagdevsec/adbhoney:24.04" read_only: true volumes: - $HOME/tpotce/data/adbhoney/log:/opt/adbhoney/log diff --git a/docker/builder.sh b/docker/builder.sh index 1ca5c65d4..9272f77d4 100755 --- a/docker/builder.sh +++ b/docker/builder.sh @@ -6,7 +6,7 @@ myPLATFORMS="linux/amd64,linux/arm64" myHUBORG_DOCKER="dtagdevsec" myHUBORG_GITHUB="ghcr.io/telekom-security" -myTAG="alpha" +myTAG="24.04" myIMAGESBASE="tpotinit adbhoney ciscoasa citrixhoneypot conpot cowrie ddospot dicompot dionaea elasticpot endlessh ewsposter fatt glutton hellpot heralding honeypots honeytrap ipphoney log4pot mailoney medpot nginx p0f redishoneypot sentrypeer spiderfoot suricata wordpot" myIMAGESELK="elasticsearch kibana logstash map" myIMAGESTANNER="phpox redis snare tanner" diff --git a/docker/ciscoasa/docker-compose.yml b/docker/ciscoasa/docker-compose.yml index 08346af31..484bfb3ea 100644 --- a/docker/ciscoasa/docker-compose.yml +++ b/docker/ciscoasa/docker-compose.yml @@ -19,7 +19,7 @@ services: ports: - "5000:5000/udp" - "8443:8443" - image: "dtagdevsec/ciscoasa:alpha" + image: "dtagdevsec/ciscoasa:24.04" read_only: true volumes: - $HOME/tpotce/data/ciscoasa/log:/var/log/ciscoasa diff --git a/docker/citrixhoneypot/docker-compose.yml b/docker/citrixhoneypot/docker-compose.yml index 0245d3200..758ff5abc 100644 --- a/docker/citrixhoneypot/docker-compose.yml +++ b/docker/citrixhoneypot/docker-compose.yml @@ -16,7 +16,7 @@ services: - citrixhoneypot_local ports: - "443:443" - image: "dtagdevsec/citrixhoneypot:alpha" + image: "dtagdevsec/citrixhoneypot:24.04" read_only: true volumes: - $HOME/tpotce/data/citrixhoneypot/log:/opt/citrixhoneypot/logs diff --git a/docker/conpot/docker-compose.yml b/docker/conpot/docker-compose.yml index 42298004f..3a303b787 100644 --- a/docker/conpot/docker-compose.yml +++ b/docker/conpot/docker-compose.yml @@ -37,7 +37,7 @@ services: - "2121:21" - "44818:44818" - "47808:47808/udp" - image: "dtagdevsec/conpot:alpha" + image: "dtagdevsec/conpot:24.04" read_only: true volumes: - $HOME/tpotce/data/conpot/log:/var/log/conpot @@ -61,7 +61,7 @@ services: ports: # - "161:161/udp" - "2404:2404" - image: "dtagdevsec/conpot:alpha" + image: "dtagdevsec/conpot:24.04" read_only: true volumes: - $HOME/tpotce/data/conpot/log:/var/log/conpot @@ -84,7 +84,7 @@ services: - conpot_local_guardian_ast ports: - "10001:10001" - image: "dtagdevsec/conpot:alpha" + image: "dtagdevsec/conpot:24.04" read_only: true volumes: - $HOME/tpotce/data/conpot/log:/var/log/conpot @@ -107,7 +107,7 @@ services: - conpot_local_ipmi ports: - "623:623/udp" - image: "dtagdevsec/conpot:alpha" + image: "dtagdevsec/conpot:24.04" read_only: true volumes: - $HOME/tpotce/data/conpot/log:/var/log/conpot @@ -131,7 +131,7 @@ services: ports: - "1025:1025" - "50100:50100" - image: "dtagdevsec/conpot:alpha" + image: "dtagdevsec/conpot:24.04" read_only: true volumes: - $HOME/tpotce/data/conpot/log:/var/log/conpot diff --git a/docker/cowrie/docker-compose.yml b/docker/cowrie/docker-compose.yml index c6d25d714..50d3d1f1e 100644 --- a/docker/cowrie/docker-compose.yml +++ b/docker/cowrie/docker-compose.yml @@ -20,7 +20,7 @@ services: ports: - "22:22" - "23:23" - image: "dtagdevsec/cowrie:alpha" + image: "dtagdevsec/cowrie:24.04" read_only: true volumes: - $HOME/tpotce/data/cowrie/downloads:/home/cowrie/cowrie/dl diff --git a/docker/ddospot/docker-compose.yml b/docker/ddospot/docker-compose.yml index 2506e6686..7e0d33c47 100644 --- a/docker/ddospot/docker-compose.yml +++ b/docker/ddospot/docker-compose.yml @@ -20,7 +20,7 @@ services: - "123:123/udp" # - "161:161/udp" - "1900:1900/udp" - image: "dtagdevsec/ddospot:alpha" + image: "dtagdevsec/ddospot:24.04" read_only: true volumes: - $HOME/tpotce/data/ddospot/log:/opt/ddospot/ddospot/logs diff --git a/docker/deprecated/cyberchef/docker-compose.yml b/docker/deprecated/cyberchef/docker-compose.yml index d11577922..abfad1bc8 100644 --- a/docker/deprecated/cyberchef/docker-compose.yml +++ b/docker/deprecated/cyberchef/docker-compose.yml @@ -14,5 +14,5 @@ services: - cyberchef_local ports: - "127.0.0.1:64299:8000" - image: "dtagdevsec/cyberchef:alpha" + image: "dtagdevsec/cyberchef:24.04" read_only: true diff --git a/docker/deprecated/head/docker-compose.yml b/docker/deprecated/head/docker-compose.yml index 94630116a..17e973a6b 100644 --- a/docker/deprecated/head/docker-compose.yml +++ b/docker/deprecated/head/docker-compose.yml @@ -12,5 +12,5 @@ services: # condition: service_healthy ports: - "127.0.0.1:64302:9100" - image: "dtagdevsec/head:alpha" + image: "dtagdevsec/head:24.04" read_only: true diff --git a/docker/deprecated/honeypy/docker-compose.yml b/docker/deprecated/honeypy/docker-compose.yml index a52347e2c..6787aa4e5 100644 --- a/docker/deprecated/honeypy/docker-compose.yml +++ b/docker/deprecated/honeypy/docker-compose.yml @@ -20,7 +20,7 @@ services: - "2324:2324" - "4096:4096" - "9200:9200" - image: "dtagdevsec/honeypy:alpha" + image: "dtagdevsec/honeypy:24.04" read_only: true volumes: - /data/honeypy/log:/opt/honeypy/log diff --git a/docker/deprecated/honeysap/docker-compose.yml b/docker/deprecated/honeysap/docker-compose.yml index 4b7041169..a14f66a7b 100644 --- a/docker/deprecated/honeysap/docker-compose.yml +++ b/docker/deprecated/honeysap/docker-compose.yml @@ -14,6 +14,6 @@ services: - honeysap_local ports: - "3299:3299" - image: "dtagdevsec/honeysap:alpha" + image: "dtagdevsec/honeysap:24.04" volumes: - /data/honeysap/log:/opt/honeysap/log diff --git a/docker/deprecated/rdpy/docker-compose.yml b/docker/deprecated/rdpy/docker-compose.yml index 4e2c5750e..b79c4fc51 100644 --- a/docker/deprecated/rdpy/docker-compose.yml +++ b/docker/deprecated/rdpy/docker-compose.yml @@ -22,7 +22,7 @@ services: - rdpy_local ports: - "3389:3389" - image: "dtagdevsec/rdpy:alpha" + image: "dtagdevsec/rdpy:24.04" read_only: true volumes: - /data/rdpy/log:/var/log/rdpy diff --git a/docker/dicompot/docker-compose.yml b/docker/dicompot/docker-compose.yml index 6272502c5..fc21d7a18 100644 --- a/docker/dicompot/docker-compose.yml +++ b/docker/dicompot/docker-compose.yml @@ -19,7 +19,7 @@ services: - dicompot_local ports: - "11112:11112" - image: "dtagdevsec/dicompot:alpha" + image: "dtagdevsec/dicompot:24.04" read_only: true volumes: - $HOME/tpotce/data/dicompot/log:/var/log/dicompot diff --git a/docker/dionaea/docker-compose.yml b/docker/dionaea/docker-compose.yml index 6be5e834b..3f56048a2 100644 --- a/docker/dionaea/docker-compose.yml +++ b/docker/dionaea/docker-compose.yml @@ -33,7 +33,7 @@ services: # - "5060:5060/udp" # - "5061:5061" - "27017:27017" - image: "dtagdevsec/dionaea:alpha" + image: "dtagdevsec/dionaea:24.04" read_only: true volumes: - $HOME/tpotce/data/dionaea/roots/ftp:/opt/dionaea/var/dionaea/roots/ftp diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index b9599df6d..772343edf 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -10,133 +10,133 @@ services: # Adbhoney service adbhoney: build: adbhoney/. - image: "dtagdevsec/adbhoney:alpha" + image: "dtagdevsec/adbhoney:24.04" # Ciscoasa service ciscoasa: build: ciscoasa/. - image: "dtagdevsec/ciscoasa:alpha" + image: "dtagdevsec/ciscoasa:24.04" # CitrixHoneypot service citrixhoneypot: build: citrixhoneypot/. - image: "dtagdevsec/citrixhoneypot:alpha" + image: "dtagdevsec/citrixhoneypot:24.04" # Conpot IEC104 service conpot_IEC104: build: conpot/. - image: "dtagdevsec/conpot:alpha" + image: "dtagdevsec/conpot:24.04" # Cowrie service cowrie: build: cowrie/. - image: "dtagdevsec/cowrie:alpha" + image: "dtagdevsec/cowrie:24.04" # Ddospot service ddospot: build: ddospot/. - image: "dtagdevsec/ddospot:alpha" + image: "dtagdevsec/ddospot:24.04" # Dicompot service dicompot: build: dicompot/. - image: "dtagdevsec/dicompot:alpha" + image: "dtagdevsec/dicompot:24.04" # Dionaea service dionaea: build: dionaea/. - image: "dtagdevsec/dionaea:alpha" + image: "dtagdevsec/dionaea:24.04" # ElasticPot service elasticpot: build: elasticpot/. - image: "dtagdevsec/elasticpot:alpha" + image: "dtagdevsec/elasticpot:24.04" # Endlessh service endlessh: build: endlessh/. - image: "dtagdevsec/endlessh:alpha" + image: "dtagdevsec/endlessh:24.04" # Glutton service glutton: build: glutton/. - image: "dtagdevsec/glutton:alpha" + image: "dtagdevsec/glutton:24.04" # Hellpot service hellpot: build: hellpot/. - image: "dtagdevsec/hellpot:alpha" + image: "dtagdevsec/hellpot:24.04" # Heralding service heralding: build: heralding/. - image: "dtagdevsec/heralding:alpha" + image: "dtagdevsec/heralding:24.04" # Honeypots service honeypots: build: honeypots/. - image: "dtagdevsec/honeypots:alpha" + image: "dtagdevsec/honeypots:24.04" # Honeytrap service honeytrap: build: honeytrap/. - image: "dtagdevsec/honeytrap:alpha" + image: "dtagdevsec/honeytrap:24.04" # IPPHoney service ipphoney: build: ipphoney/. - image: "dtagdevsec/ipphoney:alpha" + image: "dtagdevsec/ipphoney:24.04" # Log4Pot service log4pot: build: log4pot/. - image: "dtagdevsec/log4pot:alpha" + image: "dtagdevsec/log4pot:24.04" # Mailoney service mailoney: build: mailoney/. - image: "dtagdevsec/mailoney:alpha" + image: "dtagdevsec/mailoney:24.04" # Medpot service medpot: build: medpot/. - image: "dtagdevsec/medpot:alpha" + image: "dtagdevsec/medpot:24.04" # Redishoneypot service redishoneypot: build: redishoneypot/. - image: "dtagdevsec/redishoneypot:alpha" + image: "dtagdevsec/redishoneypot:24.04" # Sentrypeer service sentrypeer: build: sentrypeer/. - image: "dtagdevsec/sentrypeer:alpha" + image: "dtagdevsec/sentrypeer:24.04" #### Snare / Tanner ## Tanner Redis Service tanner_redis: build: tanner/redis/. - image: "dtagdevsec/redis:alpha" + image: "dtagdevsec/redis:24.04" ## PHP Sandbox service tanner_phpox: build: tanner/phpox/. - image: "dtagdevsec/phpox:alpha" + image: "dtagdevsec/phpox:24.04" ## Tanner API Service tanner_api: build: tanner/tanner/. - image: "dtagdevsec/tanner:alpha" + image: "dtagdevsec/tanner:24.04" ## Snare Service snare: build: tanner/snare/. - image: "dtagdevsec/snare:alpha" + image: "dtagdevsec/snare:24.04" ## Wordpot Service wordpot: build: wordpot/. - image: "dtagdevsec/wordpot:alpha" + image: "dtagdevsec/wordpot:24.04" ################## @@ -146,17 +146,17 @@ services: # Fatt service fatt: build: fatt/. - image: "dtagdevsec/fatt:alpha" + image: "dtagdevsec/fatt:24.04" # P0f service p0f: build: p0f/. - image: "dtagdevsec/p0f:alpha" + image: "dtagdevsec/p0f:24.04" # Suricata service suricata: build: suricata/. - image: "dtagdevsec/suricata:alpha" + image: "dtagdevsec/suricata:24.04" ################## @@ -167,34 +167,34 @@ services: ## Elasticsearch service elasticsearch: build: elk/elasticsearch/. - image: "dtagdevsec/elasticsearch:alpha" + image: "dtagdevsec/elasticsearch:24.04" ## Kibana service kibana: build: elk/kibana/. - image: "dtagdevsec/kibana:alpha" + image: "dtagdevsec/kibana:24.04" ## Logstash service logstash: build: elk/logstash/. - image: "dtagdevsec/logstash:alpha" + image: "dtagdevsec/logstash:24.04" # Ewsposter service ewsposter: build: ewsposter/. - image: "dtagdevsec/ewsposter:alpha" + image: "dtagdevsec/ewsposter:24.04" # Nginx service nginx: build: nginx/. - image: "dtagdevsec/nginx:alpha" + image: "dtagdevsec/nginx:24.04" # Spiderfoot service spiderfoot: build: spiderfoot/. - image: "dtagdevsec/spiderfoot:alpha" + image: "dtagdevsec/spiderfoot:24.04" # Map Web Service map_web: build: elk/map/. - image: "dtagdevsec/map:alpha" + image: "dtagdevsec/map:24.04" diff --git a/docker/elasticpot/docker-compose.yml b/docker/elasticpot/docker-compose.yml index e8f0530a7..9291c15b9 100644 --- a/docker/elasticpot/docker-compose.yml +++ b/docker/elasticpot/docker-compose.yml @@ -16,7 +16,7 @@ services: - elasticpot_local ports: - "9200:9200" - image: "dtagdevsec/elasticpot:alpha" + image: "dtagdevsec/elasticpot:24.04" read_only: true volumes: - $HOME/tpotce/data/elasticpot/log:/opt/elasticpot/log diff --git a/docker/elk/docker-compose.yml b/docker/elk/docker-compose.yml index 4ed568a4f..bf5fba1dc 100644 --- a/docker/elk/docker-compose.yml +++ b/docker/elk/docker-compose.yml @@ -24,7 +24,7 @@ services: mem_limit: 4g ports: - "127.0.0.1:64298:9200" - image: "dtagdevsec/elasticsearch:alpha" + image: "dtagdevsec/elasticsearch:24.04" volumes: - $HOME/tpotce/data:/data @@ -40,7 +40,7 @@ services: mem_limit: 1g ports: - "127.0.0.1:64296:5601" - image: "dtagdevsec/kibana:alpha" + image: "dtagdevsec/kibana:24.04" ## Logstash service logstash: @@ -52,7 +52,7 @@ services: depends_on: elasticsearch: condition: service_healthy - image: "dtagdevsec/logstash:alpha" + image: "dtagdevsec/logstash:24.04" volumes: - $HOME/tpotce/data:/data # - /root/tpotce/docker/elk/logstash/dist/logstash.conf:/etc/logstash/conf.d/logstash.conf @@ -65,7 +65,7 @@ services: tty: true ports: - "127.0.0.1:6379:6379" - image: "dtagdevsec/redis:alpha" + image: "dtagdevsec/redis:24.04" read_only: true # Map Web Service @@ -79,7 +79,7 @@ services: tty: true ports: - "127.0.0.1:64299:64299" - image: "dtagdevsec/map:alpha" + image: "dtagdevsec/map:24.04" depends_on: - map_redis @@ -91,6 +91,6 @@ services: - MAP_COMMAND=DataServer_v2.py stop_signal: SIGKILL tty: true - image: "dtagdevsec/map:alpha" + image: "dtagdevsec/map:24.04" depends_on: - map_redis diff --git a/docker/elk/elasticsearch/docker-compose.yml b/docker/elk/elasticsearch/docker-compose.yml index 07405bc59..64916ca78 100644 --- a/docker/elk/elasticsearch/docker-compose.yml +++ b/docker/elk/elasticsearch/docker-compose.yml @@ -24,6 +24,6 @@ services: mem_limit: 2g ports: - "127.0.0.1:64298:9200" - image: "dtagdevsec/elasticsearch:alpha" + image: "dtagdevsec/elasticsearch:24.04" volumes: - $HOME/tpotce/data:/data diff --git a/docker/elk/kibana/docker-compose.yml b/docker/elk/kibana/docker-compose.yml index 65b24d024..7751d99ae 100644 --- a/docker/elk/kibana/docker-compose.yml +++ b/docker/elk/kibana/docker-compose.yml @@ -12,4 +12,4 @@ services: # condition: service_healthy ports: - "127.0.0.1:64296:5601" - image: "dtagdevsec/kibana:alpha" + image: "dtagdevsec/kibana:24.04" diff --git a/docker/elk/logstash/docker-compose.yml b/docker/elk/logstash/docker-compose.yml index 2fd785703..d73bb3fa1 100644 --- a/docker/elk/logstash/docker-compose.yml +++ b/docker/elk/logstash/docker-compose.yml @@ -14,7 +14,7 @@ services: # condition: service_healthy ports: - "127.0.0.1:64305:64305" - image: "dtagdevsec/logstash:alpha" + image: "dtagdevsec/logstash:24.04" volumes: - $HOME/tpotce/data:/data # - /$HOME/tpotce/docker/elk/logstash/dist/logstash.conf:/etc/logstash/conf.d/logstash.conf diff --git a/docker/elk/map/docker-compose.yml b/docker/elk/map/docker-compose.yml index ac9de589b..475af0394 100644 --- a/docker/elk/map/docker-compose.yml +++ b/docker/elk/map/docker-compose.yml @@ -11,7 +11,7 @@ services: restart: always stop_signal: SIGKILL tty: true - image: "dtagdevsec/redis:alpha" + image: "dtagdevsec/redis:24.04" read_only: true # Map Web Service @@ -25,7 +25,7 @@ services: tty: true ports: - "127.0.0.1:64299:64299" - image: "dtagdevsec/map:alpha" + image: "dtagdevsec/map:24.04" depends_on: - map_redis @@ -39,6 +39,6 @@ services: # - TZ=${TPOT_ATTACKMAP_TEXT_TIMEZONE} stop_signal: SIGKILL tty: true - image: "dtagdevsec/map:alpha" + image: "dtagdevsec/map:24.04" depends_on: - map_redis diff --git a/docker/endlessh/docker-compose.yml b/docker/endlessh/docker-compose.yml index 1a7bbe83d..cbe011999 100644 --- a/docker/endlessh/docker-compose.yml +++ b/docker/endlessh/docker-compose.yml @@ -16,7 +16,7 @@ services: - endlessh_local ports: - "22:2222" - image: "dtagdevsec/endlessh:alpha" + image: "dtagdevsec/endlessh:24.04" read_only: true volumes: - $HOME/tpotce/data/endlessh/log:/var/log/endlessh diff --git a/docker/ewsposter/docker-compose.yml b/docker/ewsposter/docker-compose.yml index 4e1160401..34bc9517d 100644 --- a/docker/ewsposter/docker-compose.yml +++ b/docker/ewsposter/docker-compose.yml @@ -23,7 +23,7 @@ services: - EWS_HPFEEDS_SECRET=secret - EWS_HPFEEDS_TLSCERT=false - EWS_HPFEEDS_FORMAT=json - image: "dtagdevsec/ewsposter:alpha" + image: "dtagdevsec/ewsposter:24.04" volumes: - $HOME/tpotce/data:/data - $HOME/tpotce/data/ews/conf/ews.ip:/opt/ewsposter/ews.ip diff --git a/docker/fatt/docker-compose.yml b/docker/fatt/docker-compose.yml index 521254dae..29860f3f1 100644 --- a/docker/fatt/docker-compose.yml +++ b/docker/fatt/docker-compose.yml @@ -14,6 +14,6 @@ services: - NET_ADMIN - SYS_NICE - NET_RAW - image: "dtagdevsec/fatt:alpha" + image: "dtagdevsec/fatt:24.04" volumes: - $HOME/tpotce/data/fatt/log:/opt/fatt/log diff --git a/docker/glutton/docker-compose.yml b/docker/glutton/docker-compose.yml index 61ad0ae22..1ac00b40b 100644 --- a/docker/glutton/docker-compose.yml +++ b/docker/glutton/docker-compose.yml @@ -15,7 +15,7 @@ services: network_mode: "host" cap_add: - NET_ADMIN - image: "dtagdevsec/glutton:alpha" + image: "dtagdevsec/glutton:24.04" read_only: true volumes: - $HOME/tpotce/data/glutton/log:/var/log/glutton diff --git a/docker/hellpot/docker-compose.yml b/docker/hellpot/docker-compose.yml index dd5fa31bd..3c94eca75 100644 --- a/docker/hellpot/docker-compose.yml +++ b/docker/hellpot/docker-compose.yml @@ -16,7 +16,7 @@ services: - hellpot_local ports: - "80:8080" - image: "dtagdevsec/hellpot:alpha" + image: "dtagdevsec/hellpot:24.04" read_only: true volumes: - $HOME/tpotce/data/hellpot/log:/var/log/hellpot diff --git a/docker/heralding/docker-compose.yml b/docker/heralding/docker-compose.yml index 675245133..cb59d41a6 100644 --- a/docker/heralding/docker-compose.yml +++ b/docker/heralding/docker-compose.yml @@ -33,7 +33,7 @@ services: - "3389:3389" - "5432:5432" - "5900:5900" - image: "dtagdevsec/heralding:alpha" + image: "dtagdevsec/heralding:24.04" read_only: true volumes: - $HOME/tpotce/data/heralding/log:/var/log/heralding diff --git a/docker/honeypots/docker-compose.yml b/docker/honeypots/docker-compose.yml index 3f5c93a4f..df1ffd02a 100644 --- a/docker/honeypots/docker-compose.yml +++ b/docker/honeypots/docker-compose.yml @@ -48,7 +48,7 @@ services: - "9100:9100" - "9200:9200" - "11211:11211" - image: "dtagdevsec/honeypots:alpha" + image: "dtagdevsec/honeypots:24.04" read_only: true volumes: - $HOME/tpotce/data/honeypots/log:/var/log/honeypots diff --git a/docker/honeytrap/docker-compose.yml b/docker/honeytrap/docker-compose.yml index 3bbf5f0e4..3a5f933ae 100644 --- a/docker/honeytrap/docker-compose.yml +++ b/docker/honeytrap/docker-compose.yml @@ -14,7 +14,7 @@ services: network_mode: "host" cap_add: - NET_ADMIN - image: "dtagdevsec/honeytrap:alpha" + image: "dtagdevsec/honeytrap:24.04" read_only: true volumes: - /data/honeytrap/attacks:/opt/honeytrap/var/attacks diff --git a/docker/ipphoney/docker-compose.yml b/docker/ipphoney/docker-compose.yml index 6dca90dfc..7a796aa41 100644 --- a/docker/ipphoney/docker-compose.yml +++ b/docker/ipphoney/docker-compose.yml @@ -16,7 +16,7 @@ services: - ipphoney_local ports: - "631:631" - image: "dtagdevsec/ipphoney:alpha" + image: "dtagdevsec/ipphoney:24.04" read_only: true volumes: - $HOME/tpotce/data/ipphoney/log:/opt/ipphoney/log diff --git a/docker/log4pot/docker-compose.yml b/docker/log4pot/docker-compose.yml index 04424b50f..8df901357 100644 --- a/docker/log4pot/docker-compose.yml +++ b/docker/log4pot/docker-compose.yml @@ -22,7 +22,7 @@ services: - "8080:8080" - "9200:8080" - "25565:8080" - image: "dtagdevsec/log4pot:alpha" + image: "dtagdevsec/log4pot:24.04" read_only: true volumes: - $HOME/tpotce/data/log4pot/log:/var/log/log4pot/log diff --git a/docker/mailoney/docker-compose.yml b/docker/mailoney/docker-compose.yml index 0f5b879d1..00bc30086 100644 --- a/docker/mailoney/docker-compose.yml +++ b/docker/mailoney/docker-compose.yml @@ -23,7 +23,7 @@ services: ports: - "25:25" - "587:25" - image: "dtagdevsec/mailoney:alpha" + image: "dtagdevsec/mailoney:24.04" read_only: true volumes: - $HOME/tpotce/data/mailoney/log:/opt/mailoney/logs diff --git a/docker/medpot/docker-compose.yml b/docker/medpot/docker-compose.yml index 0edb7f944..e3ebc9e36 100644 --- a/docker/medpot/docker-compose.yml +++ b/docker/medpot/docker-compose.yml @@ -16,7 +16,7 @@ services: - medpot_local ports: - "2575:2575" - image: "dtagdevsec/medpot:alpha" + image: "dtagdevsec/medpot:24.04" read_only: true volumes: - $HOME/tpotce/data/medpot/log/:/var/log/medpot diff --git a/docker/nginx/docker-compose.yml b/docker/nginx/docker-compose.yml index 661176019..fd3824e81 100644 --- a/docker/nginx/docker-compose.yml +++ b/docker/nginx/docker-compose.yml @@ -22,7 +22,7 @@ services: # ports: # - "64297:64297" # - "127.0.0.1:64304:64304" - image: "dtagdevsec/nginx:alpha" + image: "dtagdevsec/nginx:24.04" read_only: true volumes: - $HOME/tpotce/data/nginx/cert/:/etc/nginx/cert/:ro diff --git a/docker/p0f/docker-compose.yml b/docker/p0f/docker-compose.yml index 63ad8754c..039aad5bd 100644 --- a/docker/p0f/docker-compose.yml +++ b/docker/p0f/docker-compose.yml @@ -10,7 +10,7 @@ services: # cpu_count: 1 # cpus: 0.75 network_mode: "host" - image: "dtagdevsec/p0f:alpha" + image: "dtagdevsec/p0f:24.04" read_only: true volumes: - $HOME/tpotce/data/p0f/log:/var/log/p0f diff --git a/docker/redishoneypot/docker-compose.yml b/docker/redishoneypot/docker-compose.yml index 0a1e2cd61..347a84eb1 100644 --- a/docker/redishoneypot/docker-compose.yml +++ b/docker/redishoneypot/docker-compose.yml @@ -16,7 +16,7 @@ services: - redishoneypot_local ports: - "6379:6379" - image: "dtagdevsec/redishoneypot:alpha" + image: "dtagdevsec/redishoneypot:24.04" read_only: true volumes: - $HOME/tpotce/data/redishoneypot/log:/var/log/redishoneypot diff --git a/docker/sentrypeer/docker-compose.yml b/docker/sentrypeer/docker-compose.yml index 3c7f0a03f..4741324d3 100644 --- a/docker/sentrypeer/docker-compose.yml +++ b/docker/sentrypeer/docker-compose.yml @@ -24,7 +24,7 @@ services: - "5060:5060/udp" - "5060:5060/tcp" # - "127.0.0.1:8082:8082" - image: "dtagdevsec/sentrypeer:alpha" + image: "dtagdevsec/sentrypeer:24.04" read_only: true volumes: - $HOME/tpotce/data/sentrypeer/log:/var/log/sentrypeer diff --git a/docker/spiderfoot/docker-compose.yml b/docker/spiderfoot/docker-compose.yml index dc8513a86..064e81697 100644 --- a/docker/spiderfoot/docker-compose.yml +++ b/docker/spiderfoot/docker-compose.yml @@ -16,6 +16,6 @@ services: - spiderfoot_local ports: - "127.0.0.1:64303:8080" - image: "dtagdevsec/spiderfoot:alpha" + image: "dtagdevsec/spiderfoot:24.04" volumes: - $HOME/tpotce/data/spiderfoot:/home/spiderfoot/.spiderfoot diff --git a/docker/suricata/docker-compose.yml b/docker/suricata/docker-compose.yml index 1031efe8e..7ac6c580d 100644 --- a/docker/suricata/docker-compose.yml +++ b/docker/suricata/docker-compose.yml @@ -17,6 +17,6 @@ services: - NET_ADMIN - SYS_NICE - NET_RAW - image: "dtagdevsec/suricata:alpha" + image: "dtagdevsec/suricata:24.04" volumes: - $HOME/tpotce/data/suricata/log:/var/log/suricata diff --git a/docker/tanner/docker-compose.yml b/docker/tanner/docker-compose.yml index 1636a6da1..e3ed8799b 100644 --- a/docker/tanner/docker-compose.yml +++ b/docker/tanner/docker-compose.yml @@ -16,7 +16,7 @@ services: # cpus: 0.25 networks: - tanner_local - image: "dtagdevsec/redis:alpha" + image: "dtagdevsec/redis:24.04" read_only: true # PHP Sandbox service @@ -32,7 +32,7 @@ services: # cpus: 0.25 networks: - tanner_local - image: "dtagdevsec/phpox:alpha" + image: "dtagdevsec/phpox:24.04" read_only: true # Tanner API Service @@ -48,7 +48,7 @@ services: # cpus: 0.25 networks: - tanner_local - image: "dtagdevsec/tanner:alpha" + image: "dtagdevsec/tanner:24.04" read_only: true volumes: - $HOME/tpotce/data/tanner/log:/var/log/tanner @@ -69,7 +69,7 @@ services: # - tanner_local # ports: # - "127.0.0.1:8091:8091" -# image: "dtagdevsec/tanner:alpha" +# image: "dtagdevsec/tanner:24.04" # command: tannerweb # read_only: true # volumes: @@ -90,7 +90,7 @@ services: # cpus: 0.25 networks: - tanner_local - image: "dtagdevsec/tanner:alpha" + image: "dtagdevsec/tanner:24.04" command: tanner read_only: true volumes: @@ -114,6 +114,6 @@ services: - tanner_local ports: - "80:80" - image: "dtagdevsec/snare:alpha" + image: "dtagdevsec/snare:24.04" depends_on: - tanner diff --git a/docker/tpotinit/docker-compose.yml b/docker/tpotinit/docker-compose.yml index 9b0322613..e5e43ab71 100644 --- a/docker/tpotinit/docker-compose.yml +++ b/docker/tpotinit/docker-compose.yml @@ -10,7 +10,7 @@ services: - $HOME/tpotce/.env restart: "no" stop_grace_period: 60s - image: "dtagdevsec/tpotinit:alpha" + image: "dtagdevsec/tpotinit:24.04" volumes: - /var/run/docker.sock:/var/run/docker.sock:ro - $HOME/tpotce/data:/data diff --git a/docker/wordpot/docker-compose.yml b/docker/wordpot/docker-compose.yml index fbd52fbc6..405f4a85e 100644 --- a/docker/wordpot/docker-compose.yml +++ b/docker/wordpot/docker-compose.yml @@ -16,7 +16,7 @@ services: - wordpot_local ports: - "80:80" - image: "dtagdevsec/wordpot:alpha" + image: "dtagdevsec/wordpot:24.04" read_only: true volumes: - $HOME/tpotce/data/wordpot/log:/opt/wordpot/logs/ diff --git a/env.example b/env.example index 10123c403..561069055 100644 --- a/env.example +++ b/env.example @@ -108,7 +108,7 @@ TPOT_DOCKER_COMPOSE=./docker-compose.yml TPOT_REPO=dtagdevsec # T-Pot Version Tag -TPOT_VERSION=alpha +TPOT_VERSION=24.04 # T-Pot Pull Policy # always: (T-Pot default) Compose implementations SHOULD always pull the image from the registry. diff --git a/genuser.sh b/genuser.sh index 37c6a3818..7835721f7 100755 --- a/genuser.sh +++ b/genuser.sh @@ -1,2 +1,2 @@ #!/usr/bin/env bash -docker run -v $HOME/tpotce:/data --entrypoint bash -it -u $(id -u):$(id -g) dtagdevsec/tpotinit:alpha "/opt/tpot/bin/genuser.sh" +docker run -v $HOME/tpotce:/data --entrypoint bash -it -u $(id -u):$(id -g) dtagdevsec/tpotinit:24.04 "/opt/tpot/bin/genuser.sh" diff --git a/install.sh b/install.sh index 6116c75b1..978cb10e3 100755 --- a/install.sh +++ b/install.sh @@ -119,7 +119,7 @@ fi if [ ! -f installer/install/tpot.yml ] && [ ! -f tpot.yml ]; then echo "### Now downloading T-Pot Ansible Installation Playbook ... " - wget -qO tpot.yml https://github.com/telekom-security/tpotce/raw/alpha/installer/install/tpot.yml + wget -qO tpot.yml https://github.com/telekom-security/tpotce/raw/24.04/installer/install/tpot.yml myANSIBLE_TPOT_PLAYBOOK="tpot.yml" echo else diff --git a/installer/install/tpot.yml b/installer/install/tpot.yml index be1716ed5..66cf5b2c5 100644 --- a/installer/install/tpot.yml +++ b/installer/install/tpot.yml @@ -694,7 +694,7 @@ git: repo: 'https://github.com/telekom-security/tpotce' dest: '/home/{{ ansible_user_id }}/tpotce/' - version: alpha + version: 24.04 clone: yes update: no when: ansible_distribution in ["AlmaLinux", "Debian", "Fedora", "openSUSE Tumbleweed", "Raspbian", "Rocky", "Ubuntu"] diff --git a/update.sh b/update.sh index 39b218993..c0bfc0a65 100755 --- a/update.sh +++ b/update.sh @@ -61,7 +61,7 @@ function fuSELFUPDATE () { return fi ### DEV - myRESULT=$(git diff --name-only origin/alpha | grep "^update.sh") + myRESULT=$(git diff --name-only origin/24.04 | grep "^update.sh") if [ "$myRESULT" == "update.sh" ]; then echo "###### $myBLUE""Found newer version, will be pulling updates and restart myself.""$myWHITE"