From 9a23e1010a7e714fcea761cec85d0c86808431dd Mon Sep 17 00:00:00 2001
From: t3chn0m4g3 <t3chn0m4g3@gmail.com>
Date: Thu, 16 Nov 2017 17:50:42 +0100
Subject: [PATCH] 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.
---
 etc/compose/all.yml        | 14 +++++++-------
 etc/compose/hp.yml         |  6 +++---
 etc/compose/industrial.yml | 10 +++++-----
 etc/compose/tpot.yml       |  4 ++--
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/etc/compose/all.yml b/etc/compose/all.yml
index 4ebd257d..097f57f5 100644
--- a/etc/compose/all.yml
+++ b/etc/compose/all.yml
@@ -1,6 +1,6 @@
 # T-Pot (Everything)
 # For docker-compose ...
-version: '2.1'
+version: '2.2'
 
 networks:
   conpot_local:
@@ -17,7 +17,7 @@ networks:
   vnclowpot_local:
 
 services:
- 
+
 # Conpot service
   conpot:
     container_name: conpot
@@ -48,7 +48,7 @@ services:
      - /data/cowrie/keys:/home/cowrie/cowrie/etc
      - /data/cowrie/log:/home/cowrie/cowrie/log
      - /data/cowrie/log/tty:/home/cowrie/cowrie/log/tty
- 
+
 # Dionaea service
   dionaea:
     container_name: dionaea
@@ -142,7 +142,7 @@ services:
       elasticsearch:
         condition: service_healthy
     env_file:
-     - /opt/tpot/etc/compose/elk_environment 
+     - /opt/tpot/etc/compose/elk_environment
     image: "dtagdevsec/logstash:1710"
     volumes:
      - /data:/data
@@ -266,7 +266,7 @@ services:
     image: "dtagdevsec/spiderfoot:1710"
     volumes:
      - /data/spiderfoot/spiderfoot.db:/home/spiderfoot/spiderfoot.db
- 
+
 # Ui-for-docker service
   ui-for-docker:
     container_name: ui-for-docker
@@ -278,8 +278,8 @@ services:
      - "127.0.0.1:64299:9000"
     image: "dtagdevsec/ui-for-docker:1710"
     volumes:
-     - /var/run/docker.sock:/var/run/docker.sock 
- 
+     - /var/run/docker.sock:/var/run/docker.sock
+
 # Suricata service
   suricata:
     container_name: suricata
diff --git a/etc/compose/hp.yml b/etc/compose/hp.yml
index fd430f77..166c3eb1 100644
--- a/etc/compose/hp.yml
+++ b/etc/compose/hp.yml
@@ -1,6 +1,6 @@
 # T-Pot (HP)
 # For docker-compose ...
-version: '2.1'
+version: '2.2'
 
 networks:
   cowrie_local:
@@ -13,7 +13,7 @@ networks:
   vnclowpot_local:
 
 services:
- 
+
 # Cowrie service
   cowrie:
     container_name: cowrie
@@ -31,7 +31,7 @@ services:
      - /data/cowrie/keys:/home/cowrie/cowrie/etc
      - /data/cowrie/log:/home/cowrie/cowrie/log
      - /data/cowrie/log/tty:/home/cowrie/cowrie/log/tty
- 
+
 # Dionaea service
   dionaea:
     container_name: dionaea
diff --git a/etc/compose/industrial.yml b/etc/compose/industrial.yml
index d3c49084..29262782 100644
--- a/etc/compose/industrial.yml
+++ b/etc/compose/industrial.yml
@@ -1,6 +1,6 @@
 # T-Pot (Industrial)
 # For docker-compose ...
-version: '2.1'
+version: '2.2'
 
 networks:
   conpot_local:
@@ -10,7 +10,7 @@ networks:
   ui-for-docker_local:
 
 services:
- 
+
 # Conpot service
   conpot:
     container_name: conpot
@@ -141,7 +141,7 @@ services:
     image: "dtagdevsec/spiderfoot:1710"
     volumes:
      - /data/spiderfoot/spiderfoot.db:/home/spiderfoot/spiderfoot.db
- 
+
 # Ui-for-docker service
   ui-for-docker:
     container_name: ui-for-docker
@@ -153,8 +153,8 @@ services:
      - "127.0.0.1:64299:9000"
     image: "dtagdevsec/ui-for-docker:1710"
     volumes:
-     - /var/run/docker.sock:/var/run/docker.sock 
- 
+     - /var/run/docker.sock:/var/run/docker.sock
+
 # Suricata service
   suricata:
     container_name: suricata
diff --git a/etc/compose/tpot.yml b/etc/compose/tpot.yml
index 21dfb8ff..f6581706 100644
--- a/etc/compose/tpot.yml
+++ b/etc/compose/tpot.yml
@@ -1,6 +1,6 @@
 # T-Pot (Standard)
 # For docker-compose ...
-version: '2.1'
+version: '2.2'
 
 networks:
   cowrie_local:
@@ -248,7 +248,7 @@ services:
      - "127.0.0.1:64299:9000"
     image: "dtagdevsec/ui-for-docker:1710"
     volumes:
-     - /var/run/docker.sock:/var/run/docker.sock 
+     - /var/run/docker.sock:/var/run/docker.sock
 
 # Suricata service
   suricata: