From 30200906951e220da7c29f1154a806888b404add Mon Sep 17 00:00:00 2001
From: Tobias Kessels <tobias.kessels@certbw.de>
Date: Mon, 27 May 2019 15:41:27 +0200
Subject: [PATCH] added mailunpack

---
 dockerfiles/elk/docker-compose.yml | 9 +++++++--
 mailunpack                         | 6 ++++++
 2 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100755 mailunpack

diff --git a/dockerfiles/elk/docker-compose.yml b/dockerfiles/elk/docker-compose.yml
index fd11485..82d0f1c 100644
--- a/dockerfiles/elk/docker-compose.yml
+++ b/dockerfiles/elk/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '2'
 services:
     elasticsearch:
-        image: docker.elastic.co/elasticsearch/elasticsearch:6.5.1
+        image: docker.elastic.co/elasticsearch/elasticsearch:7.0.1
         # container_name: elasticsearch
         hostname: elasticsearch
         ports:
@@ -10,6 +10,11 @@ services:
         volumes:
         - elastic-data:/usr/share/elasticsearch/data
         environment:
+        - node.name=elasticsearch
+        - discovery.type=single-node
+        # - discovery.seed_hosts=elasticsearch
+        # - cluster.initial_master_nodes=es01,es02
+        # - cluster.name=docker-cluster
         - bootstrap.memory_lock=true
         - "ES_JAVA_OPTS=-Xms2g -Xmx2g"
         ulimits:
@@ -22,7 +27,7 @@ services:
 
     kibana:
         image:
-            docker.elastic.co/kibana/kibana:6.5.1
+            docker.elastic.co/kibana/kibana:7.0.1
         # container_name: kibana
         hostname: kibana
         ports:
diff --git a/mailunpack b/mailunpack
new file mode 100755
index 0000000..7dd4aaf
--- /dev/null
+++ b/mailunpack
@@ -0,0 +1,6 @@
+#!/bin/bash
+current_dir=$(pwd)
+mail_fail=$(readlink -f "${1}")
+filename=$(basename "${mail_fail}")
+file_dir=$(dirname "${mail_fail}")
+docker run -it --rm --user=`id -u` --net=none -v "${current_dir}:/home/nonroot/" -v "${file_dir}:/data:ro" tabledevil/file-analysis munpack -t "/data/${filename}"