Update submodules and Docker for IntelMQ 3.2

.docker/intelmq-full/Dockerfile

@@ -55,7 +55,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 +66,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

@@ -16,5 +16,5 @@ then
     export INTELMQ_TEST_EXOTIC=1
     nosetests3 /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