diff --git a/.docker/intelmq-full-dev/entrypoint-dev.sh b/.docker/intelmq-full-dev/entrypoint-dev.sh index b3f45ff..6553d14 100644 --- a/.docker/intelmq-full-dev/entrypoint-dev.sh +++ b/.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 diff --git a/.docker/intelmq-full/Dockerfile b/.docker/intelmq-full/Dockerfile index 849cf26..b93e277 100644 --- a/.docker/intelmq-full/Dockerfile +++ b/.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 \ diff --git a/entrypoint.sh b/entrypoint.sh index caa66f1..e59fc49 100644 --- a/entrypoint.sh +++ b/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 && uvicorn intelmq_api.main:app -p8080 fi diff --git a/publish.sh b/publish.sh index 7cc9fd2..288e428 100755 --- a/publish.sh +++ b/publish.sh @@ -1,5 +1,5 @@ #!/bin/bash -build_version="3.0.2" +build_version="3.2.0" namespace="certat" docker login diff --git a/test.sh b/test.sh index 7010ee1..018426e 100755 --- a/test.sh +++ b/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