Merge pull request #24 from certat/intelmq-3.2

Update submodules and Docker for IntelMQ 3.2

.docker/intelmq-full-dev/entrypoint-dev.sh

@@ -24,8 +24,8 @@ fi
 if [[ $1 == "selftest" ]]
 then
     export INTELMQ_TEST_EXOTIC=1
-    nosetests3 /etc/intelmq/intelmq/tests
+    pytest-3 /etc/intelmq/intelmq/tests
 else
-    cd /etc/intelmq-api && hug -m intelmq_api.serve -p8080
+    cd /etc/intelmq-api && uvicorn intelmq_api.main:app -p8080
 fi
 

.docker/intelmq-full/Dockerfile

@@ -23,7 +23,6 @@ RUN apt-get update \
     rsync \
     ssh \
     python3-pika \
-    python3-nose \
     python3-dev \
     python3-setuptools \
     python3-pip \
@@ -34,6 +33,8 @@ RUN apt-get update \
     python3-xmltodict \
     python3-cerberus \
     python3-requests-mock \
+    python3-pytest \
+    python3-pytest-cov \
     python3-shodan \
     python3-elasticsearch \
     python3-pymongo \
@@ -55,7 +56,7 @@ RUN useradd -d /opt/intelmq -U -s /bin/bash intelmq \
     && sudo chown -R intelmq:intelmq /opt/intelmq_persistence
 
 ### Install IntelMQ
-RUN pip3 install hug url-normalize geolib imbox jinja2 pyasn textx tld time-machine otxv2 \
+RUN pip3 install url-normalize geolib imbox jinja2 pyasn textx tld time-machine otxv2 \
     && pip3 install --force pymisp[fileobjects,openioc,virustotal]
 
 RUN cd /opt/intelmq \
@@ -66,7 +67,7 @@ RUN cd /opt/intelmq \
 
 ### Install IntelMQ-API
 RUN cd /opt/intelmq-api \
-    && python3 setup.py install
+    && pip3 install .
 
 ADD entrypoint.sh /opt/entrypoint.sh
 RUN chmod +x /opt/entrypoint.sh \

build.sh

@@ -12,7 +12,7 @@ echo Api       : $git_ref_api
 echo Build_date: $build_date
 
 # build static html
-cd ./intelmq-manager && python3 setup.py build && cd ..
+cd ./intelmq-manager && python3 -m pip install . && intelmq-manager-build && cd ..
 
 docker build --build-arg BUILD_DATE=$build_date \
     --build-arg VCS_REF="IntelMQ-Manager=$git_ref_manager" \

entrypoint.sh

@@ -14,7 +14,7 @@ intelmq-api-adduser --user "$intelmq_user" --password "$intelmq_pass"
 if [[ $1 == "selftest" ]]
 then
     export INTELMQ_TEST_EXOTIC=1
-    nosetests3 /opt/intelmq/intelmq/tests
+    pytest-3 /opt/intelmq/intelmq/tests
 else
-    cd /opt/intelmq-api && hug -m intelmq_api.serve -p8080
+    cd /opt/intelmq-api && uvicorn intelmq_api.main:app -p8080
 fi

publish.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-build_version="3.0.2"
+build_version="3.2.0"
 namespace="certat"
 
 docker login

test.sh

@@ -11,8 +11,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_PIPELINE_DRIVER=\"redis\"" \
+    -e "INTELMQ_PIPELINE_DRIVER=redis" \
     -e "INTELMQ_PIPELINE_HOST=$redis_ip" \
+    -e "INTELMQ_SOURCE_PIPELINE_HOST=$redis_ip" \
+    -e "INTELMQ_DESTINATION_PIPELINE_HOST=$redis_ip" \
     -e "INTELMQ_REDIS_CACHE_HOST=$redis_ip" \
     intelmq-full:latest selftest
 
@@ -34,6 +36,8 @@ docker run --rm -v $(pwd)/example_config/intelmq/etc/:/etc/intelmq/etc/ \
     -v $(pwd)/intelmq_persistence:/opt/intelmq_persistence \
     -e "INTELMQ_PIPELINE_DRIVER=\"amqp\"" \
     -e "INTELMQ_PIPELINE_HOST=$amq_id" \
+    -e "INTELMQ_SOURCE_PIPELINE_HOST=$amq_ip" \
+    -e "INTELMQ_DESTINATION_PIPELINE_HOST=$amq_ip" \
     -e "INTELMQ_REDIS_CACHE_HOST=$redis_ip" \
     intelmq-full:latest selftest