diff --git a/.docker/intelmq-full/Dockerfile b/.docker/intelmq-full/Dockerfile index 08bd9d9..0ba5a94 100644 --- a/.docker/intelmq-full/Dockerfile +++ b/.docker/intelmq-full/Dockerfile @@ -35,6 +35,8 @@ RUN apt-get update \ python3-cerberus \ python3-requests-mock \ python3-shodan \ + python3-elasticsearch \ + python3-pymongo \ libfuzzy-dev \ && rm -rf /var/lib/apt/lists/* diff --git a/test.sh b/test.sh index 60e80bf..7010ee1 100755 --- a/test.sh +++ b/test.sh @@ -1,11 +1,28 @@ #!/bin/bash +echo RUNNING TESTS WITH REDIS 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=$(docker inspect -f '{{ range.NetworkSettings.Networks }}{{ .IPAddress }}{{ end }}' $redis_id) + +echo Setting up IntelMQ-Container +docker run --rm -v $(pwd)/example_config/intelmq/etc/:/etc/intelmq/etc/ \ + -v $(pwd)/example_config/intelmq-api:/etc/intelmq-api/config \ + -v $(pwd)/intelmq_logs:/etc/intelmq/var/log \ + -v $(pwd)/intelmq_output:/etc/intelmq/var/lib/bots \ + -v $(pwd)/example_config/intelmq/var/lib/bot:/etc/intelmq/var/lib/bot \ + -v $(pwd)/intelmq_persistence:/opt/intelmq_persistence \ + -e "INTELMQ_PIPELINE_DRIVER=\"redis\"" \ + -e "INTELMQ_PIPELINE_HOST=$redis_ip" \ + -e "INTELMQ_REDIS_CACHE_HOST=$redis_ip" \ + intelmq-full:latest selftest + +echo Removing redis container +docker container kill $redis_id + +echo RUNNING TESTS WITH AMQP echo Setting up AMQP container amq_id=$(docker run --rm -d -p 5672:5672 -p 15672:15672 rabbitmq:latest) - -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 @@ -15,15 +32,10 @@ docker run --rm -v $(pwd)/example_config/intelmq/etc/:/etc/intelmq/etc/ \ -v $(pwd)/intelmq_output:/etc/intelmq/var/lib/bots \ -v $(pwd)/example_config/intelmq/var/lib/bot:/etc/intelmq/var/lib/bot \ -v $(pwd)/intelmq_persistence:/opt/intelmq_persistence \ - -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_PIPELINE_DRIVER=\"amqp\"" \ + -e "INTELMQ_PIPELINE_HOST=$amq_id" \ -e "INTELMQ_REDIS_CACHE_HOST=$redis_ip" \ intelmq-full:latest selftest -echo Removing redis container -docker container kill $redis_id - echo Removing AMQP container docker container kill $amq_id