prep for 18.04

etc/compose/tpot.yml

@@ -3,6 +3,7 @@
 version: '2.2'
 
 networks:
+  ciscoasa_local:
   cowrie_local:
   dionaea_local:
   elasticpot_local:
@@ -16,6 +17,19 @@ networks:
 
 services:
 
+# Ciscoasa service
+  ciscoasa:
+    container_name: ciscoasa
+    restart: always
+    networks:
+     - ciscoasa_local
+    ports:
+     - "5000:5000/udp"
+     - "8443:8443"
+    image: "dtagdevsec/ciscoasa:1804"
+    volumes:
+     - /data/ciscoasa/log:/var/log/ciscoasa
+
 # Cowrie service
   cowrie:
     container_name: cowrie
@@ -26,8 +40,8 @@ services:
      - NET_BIND_SERVICE
     ports:
      - "22:2222"
-     - "23:2223"
-    image: "dtagdevsec/cowrie:1710"
+     - "23:2323"
+    image: "dtagdevsec/cowrie:1804"
     volumes:
      - /data/cowrie/downloads:/home/cowrie/cowrie/dl
      - /data/cowrie/keys:/home/cowrie/cowrie/etc
@@ -60,7 +74,7 @@ services:
      - "5060:5060/udp"
      - "5061:5061"
      - "27017:27017"
-    image: "dtagdevsec/dionaea:1710"
+    image: "dtagdevsec/dionaea:1804"
     volumes:
      - /data/dionaea/roots/ftp:/opt/dionaea/var/dionaea/roots/ftp
      - /data/dionaea/roots/tftp:/opt/dionaea/var/dionaea/roots/tftp
@@ -79,7 +93,7 @@ services:
      - elasticpot_local
     ports:
      - "9200:9200"
-    image: "dtagdevsec/elasticpot:1710"
+    image: "dtagdevsec/elasticpot:1804"
     volumes:
      - /data/elasticpot/log:/opt/ElasticpotPY/log
 
@@ -90,7 +104,7 @@ services:
     restart: always
     environment:
      - bootstrap.memory_lock=true
-     - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
+     - "ES_JAVA_OPTS=-Xms1024m -Xmx1024m"
     cap_add:
      - IPC_LOCK
     ulimits:
@@ -100,10 +114,10 @@ services:
       nofile:
         soft: 65536
         hard: 65536
-#    mem_limit: 2g
+    mem_limit: 2g
     ports:
      - "127.0.0.1:64298:9200"
-    image: "dtagdevsec/elasticsearch:1710"
+    image: "dtagdevsec/elasticsearch:1804"
     volumes:
      - /data:/data
 
@@ -116,7 +130,7 @@ services:
         condition: service_healthy
     ports:
      - "127.0.0.1:64296:5601"
-    image: "dtagdevsec/kibana:1710"
+    image: "dtagdevsec/kibana:1804"
 
 ## Logstash service
   logstash:
@@ -127,7 +141,7 @@ services:
         condition: service_healthy
     env_file:
      - /opt/tpot/etc/compose/elk_environment
-    image: "dtagdevsec/logstash:1710"
+    image: "dtagdevsec/logstash:1804"
     volumes:
      - /data:/data
      - /var/log:/data/host/log
@@ -141,7 +155,7 @@ services:
         condition: service_healthy
     ports:
      - "127.0.0.1:64302:9100"
-    image: "dtagdevsec/head:1710"
+    image: "dtagdevsec/head:1804"
 
 # Ewsposter service
   ewsposter:
@@ -151,7 +165,7 @@ services:
      - ewsposter_local
     env_file:
      - /opt/tpot/etc/compose/elk_environment
-    image: "dtagdevsec/ewsposter:1710"
+    image: "dtagdevsec/ewsposter:1804"
     volumes:
      - /data:/data
      - /data/ews/conf/ews.ip:/opt/ewsposter/ews.ip
@@ -164,7 +178,7 @@ services:
      - glastopf_local
     ports:
      - "80:80"
-    image: "dtagdevsec/glastopf:1710"
+    image: "dtagdevsec/glastopf:1804"
     volumes:
      - /data/glastopf/db:/opt/glastopf/db
      - /data/glastopf/log:/opt/glastopf/log
@@ -176,7 +190,7 @@ services:
     network_mode: "host"
     cap_add:
      - NET_ADMIN
-    image: "dtagdevsec/honeytrap:1710"
+    image: "dtagdevsec/honeytrap:1804"
     volumes:
      - /data/honeytrap/attacks:/opt/honeytrap/var/attacks
      - /data/honeytrap/downloads:/opt/honeytrap/var/downloads
@@ -190,7 +204,7 @@ services:
      - mailoney_local
     ports:
      - "25:2525"
-    image: "dtagdevsec/mailoney:1710"
+    image: "dtagdevsec/mailoney:1804"
     volumes:
      - /data/mailoney/log:/opt/mailoney/logs
 
@@ -208,7 +222,7 @@ services:
      - apparmor=unconfined
     ports:
      - "64301:64301"
-    image: "dtagdevsec/netdata:1710"
+    image: "dtagdevsec/netdata:1804"
     volumes:
      - /proc:/host/proc:ro
      - /sys:/host/sys:ro