From def6b14cea13f39f7260ef2a22e804809f581d75 Mon Sep 17 00:00:00 2001
From: eliasgranderubio <eliasgr89@gmail.com>
Date: Fri, 1 Dec 2017 21:19:03 +0100
Subject: [PATCH] Multiple fixes

---
 README.md                                     |  2 +-
 .../analysis/runtime/sysdig_falco_monitor.py  |  2 +-
 dagda/cli/command/start_cli_parser.py         |  2 +-
 docker-compose.yml                            | 29 ++++++++++++-------
 dockerfiles/run.sh                            |  2 +-
 5 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index 8c6ba75..2c871d9 100644
--- a/README.md
+++ b/README.md
@@ -773,7 +773,7 @@ Execute the following commands in the root folder of **Dagda** and then, the **D
 
 ```
     $ docker-compose build
-    $ docker-compose run --service-ports dagda
+    $ docker-compose up -d
 ```
 
 ## Troubleshooting
diff --git a/dagda/analysis/runtime/sysdig_falco_monitor.py b/dagda/analysis/runtime/sysdig_falco_monitor.py
index d6d49ca..d2a2eca 100644
--- a/dagda/analysis/runtime/sysdig_falco_monitor.py
+++ b/dagda/analysis/runtime/sysdig_falco_monitor.py
@@ -35,7 +35,7 @@ class SysdigFalcoMonitor:
 
     # -- Private attributes
 
-    _tmp_directory = tempfile.gettempdir()  # This directory should be resolved as /tmp
+    _tmp_directory = "/tmp"
     _falco_output_filename = _tmp_directory + '/falco_output.json'
     _falco_custom_rules_filename = _tmp_directory + '/custom_falco_rules.yaml'
 
diff --git a/dagda/cli/command/start_cli_parser.py b/dagda/cli/command/start_cli_parser.py
index 5662bfa..0487497 100644
--- a/dagda/cli/command/start_cli_parser.py
+++ b/dagda/cli/command/start_cli_parser.py
@@ -30,7 +30,7 @@ class StartCLIParser:
     # StartCLIParser Constructor
     def __init__(self):
         super(StartCLIParser, self).__init__()
-        self.parser = DagdaStartParser(prog='dagda.py vuln', usage=start_parser_text)
+        self.parser = DagdaStartParser(prog='dagda.py start', usage=start_parser_text)
         self.parser.add_argument('-s', '--server_host', type=str)
         self.parser.add_argument('-p', '--server_port', type=int)
         self.parser.add_argument('-m', '--mongodb_host', type=str)
diff --git a/docker-compose.yml b/docker-compose.yml
index 6af83af..6b3e85b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,21 +1,28 @@
 version: '2'
 services:
-  vulndb:
-    image: mongo
-    container_name: vulndb
-    ports:
-      - "27017:27017"
-    volumes:
-      - ./db:/data/db
   dagda:
     build: .
+    image: dagda:0.7.0
     container_name: dagda
+    networks:
+      - mdb
+    entrypoint: python dagda.py start -s 0.0.0.0 -p 5000 -m vulndb -mp 27017
     ports:
       - "5000:5000"
-    environment:
-      - VULNDB_HOST=vulndb
-    links:
-        - vulndb
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock:ro
       - /tmp:/tmp:ro
+    depends_on:
+      - vulndb
+  vulndb:
+    image: mongo
+    container_name: vulndb
+    networks:
+      - mdb
+    ports:
+      - "27017:27017"
+    volumes:
+      - ./db:/data/db
+networks:
+  mdb:
+    external: false
\ No newline at end of file
diff --git a/dockerfiles/run.sh b/dockerfiles/run.sh
index 82f444d..b0cc916 100644
--- a/dockerfiles/run.sh
+++ b/dockerfiles/run.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-python dagda.py start -s "0.0.0.0" -p 5000 -m "$VULNDB_HOST" -mp 27017
+python dagda.py $@