Ubuntu introduced major update for docker

Today Ubuntu introduced a major upgrade for docker, which requires a
version bump for docker-compose files used in T-Pot.
This commit is contained in:
t3chn0m4g3 2017-11-16 17:50:42 +01:00
parent a370ae5f41
commit 9a23e1010a
4 changed files with 17 additions and 17 deletions

View file

@ -1,6 +1,6 @@
# T-Pot (Everything) # T-Pot (Everything)
# For docker-compose ... # For docker-compose ...
version: '2.1' version: '2.2'
networks: networks:
conpot_local: conpot_local:
@ -17,7 +17,7 @@ networks:
vnclowpot_local: vnclowpot_local:
services: services:
# Conpot service # Conpot service
conpot: conpot:
container_name: conpot container_name: conpot
@ -48,7 +48,7 @@ services:
- /data/cowrie/keys:/home/cowrie/cowrie/etc - /data/cowrie/keys:/home/cowrie/cowrie/etc
- /data/cowrie/log:/home/cowrie/cowrie/log - /data/cowrie/log:/home/cowrie/cowrie/log
- /data/cowrie/log/tty:/home/cowrie/cowrie/log/tty - /data/cowrie/log/tty:/home/cowrie/cowrie/log/tty
# Dionaea service # Dionaea service
dionaea: dionaea:
container_name: dionaea container_name: dionaea
@ -142,7 +142,7 @@ services:
elasticsearch: elasticsearch:
condition: service_healthy condition: service_healthy
env_file: env_file:
- /opt/tpot/etc/compose/elk_environment - /opt/tpot/etc/compose/elk_environment
image: "dtagdevsec/logstash:1710" image: "dtagdevsec/logstash:1710"
volumes: volumes:
- /data:/data - /data:/data
@ -266,7 +266,7 @@ services:
image: "dtagdevsec/spiderfoot:1710" image: "dtagdevsec/spiderfoot:1710"
volumes: volumes:
- /data/spiderfoot/spiderfoot.db:/home/spiderfoot/spiderfoot.db - /data/spiderfoot/spiderfoot.db:/home/spiderfoot/spiderfoot.db
# Ui-for-docker service # Ui-for-docker service
ui-for-docker: ui-for-docker:
container_name: ui-for-docker container_name: ui-for-docker
@ -278,8 +278,8 @@ services:
- "127.0.0.1:64299:9000" - "127.0.0.1:64299:9000"
image: "dtagdevsec/ui-for-docker:1710" image: "dtagdevsec/ui-for-docker:1710"
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
# Suricata service # Suricata service
suricata: suricata:
container_name: suricata container_name: suricata

View file

@ -1,6 +1,6 @@
# T-Pot (HP) # T-Pot (HP)
# For docker-compose ... # For docker-compose ...
version: '2.1' version: '2.2'
networks: networks:
cowrie_local: cowrie_local:
@ -13,7 +13,7 @@ networks:
vnclowpot_local: vnclowpot_local:
services: services:
# Cowrie service # Cowrie service
cowrie: cowrie:
container_name: cowrie container_name: cowrie
@ -31,7 +31,7 @@ services:
- /data/cowrie/keys:/home/cowrie/cowrie/etc - /data/cowrie/keys:/home/cowrie/cowrie/etc
- /data/cowrie/log:/home/cowrie/cowrie/log - /data/cowrie/log:/home/cowrie/cowrie/log
- /data/cowrie/log/tty:/home/cowrie/cowrie/log/tty - /data/cowrie/log/tty:/home/cowrie/cowrie/log/tty
# Dionaea service # Dionaea service
dionaea: dionaea:
container_name: dionaea container_name: dionaea

View file

@ -1,6 +1,6 @@
# T-Pot (Industrial) # T-Pot (Industrial)
# For docker-compose ... # For docker-compose ...
version: '2.1' version: '2.2'
networks: networks:
conpot_local: conpot_local:
@ -10,7 +10,7 @@ networks:
ui-for-docker_local: ui-for-docker_local:
services: services:
# Conpot service # Conpot service
conpot: conpot:
container_name: conpot container_name: conpot
@ -141,7 +141,7 @@ services:
image: "dtagdevsec/spiderfoot:1710" image: "dtagdevsec/spiderfoot:1710"
volumes: volumes:
- /data/spiderfoot/spiderfoot.db:/home/spiderfoot/spiderfoot.db - /data/spiderfoot/spiderfoot.db:/home/spiderfoot/spiderfoot.db
# Ui-for-docker service # Ui-for-docker service
ui-for-docker: ui-for-docker:
container_name: ui-for-docker container_name: ui-for-docker
@ -153,8 +153,8 @@ services:
- "127.0.0.1:64299:9000" - "127.0.0.1:64299:9000"
image: "dtagdevsec/ui-for-docker:1710" image: "dtagdevsec/ui-for-docker:1710"
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
# Suricata service # Suricata service
suricata: suricata:
container_name: suricata container_name: suricata

View file

@ -1,6 +1,6 @@
# T-Pot (Standard) # T-Pot (Standard)
# For docker-compose ... # For docker-compose ...
version: '2.1' version: '2.2'
networks: networks:
cowrie_local: cowrie_local:
@ -248,7 +248,7 @@ services:
- "127.0.0.1:64299:9000" - "127.0.0.1:64299:9000"
image: "dtagdevsec/ui-for-docker:1710" image: "dtagdevsec/ui-for-docker:1710"
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
# Suricata service # Suricata service
suricata: suricata: