From 4beea486fd2198862540322cad46b52cbd2583a9 Mon Sep 17 00:00:00 2001
From: Sebastian Waldbauer <waldbauer@cert.at>
Date: Sun, 15 Aug 2021 17:27:13 +0200
Subject: [PATCH] FIX: Updated paths in docker container

Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>
---
 docker-compose.yml   | 13 +++++++------
 entrypoint.sh        |  6 +++---
 inspect-container.sh | 13 +++++--------
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 4126357..13cd541 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -20,13 +20,14 @@ services:
         networks:
             - intelmq-internal
     intelmq:
-        image: certat/intelmq-full:1.0
+        image: intelmq-full:1.0
         volumes:
-            - ./example_config/intelmq/etc/:/opt/intelmq/etc/
-            - ./example_config/intelmq-api:/opt/intelmq-api/config
-            - ./intelmq_logs:/opt/intelmq/var/log
-            - ./intelmq_output:/opt/intelmq/var/lib/bots
-            - ./example_config/intelmq/var/lib/bot:/opt/intelmq/var/lib/bot
+            - ./example_config/intelmq/etc/:/etc/intelmq/etc/
+            - ./example_config/intelmq-api:/etc/intelmq-api/config
+            - ./intelmq_logs:/etc/intelmq/var/log
+            - ./intelmq_output:/etc/intelmq/var/lib/bots
+            - ./example_config/intelmq/var/lib/bot:/etc/intelmq/var/lib/bot
+            - ./intelmq_persistence:/opt/intelmq_persistence
         depends_on:
             - redis
         environment:
diff --git a/entrypoint.sh b/entrypoint.sh
index 2ac44c2..e38b81e 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -3,8 +3,8 @@ export INTELMQ_IS_DOCKER=1
 if [[ $1 == "selftest" ]]
 then
     export INTELMQ_TEST_EXOTIC=1
-    nosetests3 /opt/intelmq/intelmq/tests
+    nosetests3 /etc/intelmq/intelmq/tests
 else
-    export INTELMQ_API_CONFIG=/opt/intelmq-api/config/config.json
-    cd intelmq-api && hug -m intelmq_api.serve -p8080
+    export INTELMQ_API_CONFIG=/etc/intelmq-api/config/config.json
+    cd /etc/intelmq-api && hug -m intelmq_api.serve -p8080
 fi
diff --git a/inspect-container.sh b/inspect-container.sh
index 6835965..dc18bea 100755
--- a/inspect-container.sh
+++ b/inspect-container.sh
@@ -1,12 +1,9 @@
 #!/bin/bash
 docker run --rm -it --entrypoint /bin/bash \
-    -v $(pwd)/example_config/intelmq/etc:/opt/intelmq/etc \
-    -v $(pwd)/example_config/intelmq-api:/opt/intelmq_api/config \
-    -v $(pwd)/intelmq_logs:/opt/intelmq/var/log \
-    -v $(pwd)/example_config/intelmq/var/lib:/opt/intelmq/var/lib \
+    -v $(pwd)/intelmq_persistence:/opt/intelmq_persistence \
+    -v $(pwd)/example_config/intelmq/etc:/etc/intelmq/etc \
+    -v $(pwd)/example_config/intelmq-api/config.json:/etc/intelmq/api-config.json:ro \
+    -v $(pwd)/intelmq_logs:/etc/intelmq/var/log \
+    -v $(pwd)/example_config/intelmq/var/lib:/etc/intelmq/var/lib \
     -e "INTELMQ_IS_DOCKER=\"true\"" \
-    -e "INTELMQ_PIPELINE_DRIVER=\"redis\"" \
-    -e "INTELMQ_PIPELINE_HOST=$redis_ip" \
-    -e "INTELMQ_PIPELINE_AMQ_HOST=$amp_ip" \
-    -e "INTELMQ_REDIS_CACHE_HOST=$redis_ip" \
     intelmq-full:latest