CSEC_PUBLIC/intelmq-docker
1
0
Fork 0
mirror of https://github.com/certat/intelmq-docker.git synced 2025-12-06 09:12:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update to IntelMQ 3.2

Browse Source 
Move from nosetests to pytest. Move from hug to FastAPI
This commit is contained in:
Kamil Mankowski
2023-07-25 16:01:46 +02:00
parent 90e696543f
commit a597fec2a9
5 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.docker/intelmq-full-dev/entrypoint-dev.sh
View File

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

3
.docker/intelmq-full/Dockerfile
View File

@@ -23,7 +23,6 @@ RUN apt-get update \
rsync \ rsync \
ssh \ ssh \
python3-pika \ python3-pika \
python3-nose \
python3-dev \ python3-dev \
python3-setuptools \ python3-setuptools \
python3-pip \ python3-pip \
@@ -34,6 +33,8 @@ RUN apt-get update \
python3-xmltodict \ python3-xmltodict \
python3-cerberus \ python3-cerberus \
python3-requests-mock \ python3-requests-mock \
python3-pytest \
python3-pytest-cov \
python3-shodan \ python3-shodan \
python3-elasticsearch \ python3-elasticsearch \
python3-pymongo \ python3-pymongo \

2
entrypoint.sh
View File

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

2
publish.sh
View File

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

6
test.sh
View File

@@ -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)/intelmq_output:/etc/intelmq/var/lib/bots \
-v $(pwd)/example_config/intelmq/var/lib/bot:/etc/intelmq/var/lib/bot \ -v $(pwd)/example_config/intelmq/var/lib/bot:/etc/intelmq/var/lib/bot \
-v $(pwd)/intelmq_persistence:/opt/intelmq_persistence \ -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_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" \ -e "INTELMQ_REDIS_CACHE_HOST=$redis_ip" \
intelmq-full:latest selftest 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 \ -v $(pwd)/intelmq_persistence:/opt/intelmq_persistence \
-e "INTELMQ_PIPELINE_DRIVER=\"amqp\"" \ -e "INTELMQ_PIPELINE_DRIVER=\"amqp\"" \
-e "INTELMQ_PIPELINE_HOST=$amq_id" \ -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" \ -e "INTELMQ_REDIS_CACHE_HOST=$redis_ip" \
intelmq-full:latest selftest intelmq-full:latest selftest