From 13fbc401a7cd8b39b7f0f95a0b89d736de55d8ad Mon Sep 17 00:00:00 2001
From: Sebastian Waldbauer <waldbauer@cert.at>
Date: Fri, 5 Mar 2021 13:44:11 +0100
Subject: [PATCH] [FIX] Fixed path issues & added inspect-container

inspect-container.sh opens a new /bin/bash inside the container
to check files or other stuff like on normal linux maschines

Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>
---
 build.sh             |  4 ++++
 inspect-container.sh | 12 ++++++++++++
 test.sh              | 29 +++++++++++++++++++----------
 3 files changed, 35 insertions(+), 10 deletions(-)
 create mode 100755 inspect-container.sh

diff --git a/build.sh b/build.sh
index 1396bbb..6f0f5f3 100755
--- a/build.sh
+++ b/build.sh
@@ -28,3 +28,7 @@ docker build --build-arg BUILD_DATE=$build_date \
     -f ./.docker/intelmq-full/Dockerfile \
     -t intelmq-full:$build_version \
     -t intelmq-full:latest .
+
+cd ./intelmq-manager \
+    && rm -r html \
+    && cd ..
diff --git a/inspect-container.sh b/inspect-container.sh
new file mode 100755
index 0000000..6835965
--- /dev/null
+++ b/inspect-container.sh
@@ -0,0 +1,12 @@
+#!/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 \
+    -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
diff --git a/test.sh b/test.sh
index 0c82d24..b89718d 100755
--- a/test.sh
+++ b/test.sh
@@ -1,19 +1,28 @@
 #!/bin/bash
-redis_id=$(sudo docker run --rm -d -p 6379:6379 -v ~/intelmq-docker/example_config/redis/redis.conf:/redis.conf redis:latest)
-amq_id=$(sudo docker run --rm -d -p 5672:5672 -p 15672:15672 rabbitmq:latest)
+echo Setting up redis container
+redis_id=$(docker run --rm -d -p 6379:6379 -v ~/example_config/redis/redis.conf:/redis.conf redis:latest)
 
-redis_ip=$(sudo docker inspect -f '{{ range.NetworkSettings.Networks }}{{ .IPAddress }}{{ end }}' $redis_id)
-amp_ip=$(sudo docker inspect -f '{{ range.NetworkSettings.Networks}}{{ .IPAddress }}{{ end }}' $amq_id)
+echo Setting up AMQP container
+amq_id=$(docker run --rm -d -p 5672:5672 -p 15672:15672 rabbitmq:latest)
 
-sudo docker run --rm -v ~/intelmq-docker/example_config/intelmq/etc:/opt/intelmq/etc \
-    -v ~/intelmq-docker/example_config/intelmq_api:/opt/intelmq_api/config \
-    -v ~/intelmq-docker/intelmq_logs:/opt/intelmq/var/log \
-    -v ~/intelmq-docker/example_config/intelmq/var/lib:/opt/intelmq/var/lib \
+redis_ip=$(docker inspect -f '{{ range.NetworkSettings.Networks }}{{ .IPAddress }}{{ end }}' $redis_id)
+amp_ip=$(docker inspect -f '{{ range.NetworkSettings.Networks}}{{ .IPAddress }}{{ end }}' $amq_id)
+
+echo Setting up IntelMQ-Container
+docker run --rm -v $(pwd)/example_config/intelmq/etc:/opt/intelmq/etc \
+    -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 \
     -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 selftest
-sudo docker container stop $redis_id
-sudo docker container stop $amq_id
\ No newline at end of file
+
+echo Removing redis container
+docker container kill $redis_id
+
+echo Removing AMQP container
+docker container kill $amq_id