FIX: Updated paths in docker container

Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>
This commit is contained in:
Sebastian Waldbauer
2021-08-15 17:27:13 +02:00
parent c8ce343edc
commit 4beea486fd
3 changed files with 15 additions and 17 deletions

View File

@@ -20,13 +20,14 @@ services:
networks: networks:
- intelmq-internal - intelmq-internal
intelmq: intelmq:
image: certat/intelmq-full:1.0 image: intelmq-full:1.0
volumes: volumes:
- ./example_config/intelmq/etc/:/opt/intelmq/etc/ - ./example_config/intelmq/etc/:/etc/intelmq/etc/
- ./example_config/intelmq-api:/opt/intelmq-api/config - ./example_config/intelmq-api:/etc/intelmq-api/config
- ./intelmq_logs:/opt/intelmq/var/log - ./intelmq_logs:/etc/intelmq/var/log
- ./intelmq_output:/opt/intelmq/var/lib/bots - ./intelmq_output:/etc/intelmq/var/lib/bots
- ./example_config/intelmq/var/lib/bot:/opt/intelmq/var/lib/bot - ./example_config/intelmq/var/lib/bot:/etc/intelmq/var/lib/bot
- ./intelmq_persistence:/opt/intelmq_persistence
depends_on: depends_on:
- redis - redis
environment: environment:

View File

@@ -3,8 +3,8 @@ export INTELMQ_IS_DOCKER=1
if [[ $1 == "selftest" ]] if [[ $1 == "selftest" ]]
then then
export INTELMQ_TEST_EXOTIC=1 export INTELMQ_TEST_EXOTIC=1
nosetests3 /opt/intelmq/intelmq/tests nosetests3 /etc/intelmq/intelmq/tests
else else
export INTELMQ_API_CONFIG=/opt/intelmq-api/config/config.json export INTELMQ_API_CONFIG=/etc/intelmq-api/config/config.json
cd intelmq-api && hug -m intelmq_api.serve -p8080 cd /etc/intelmq-api && hug -m intelmq_api.serve -p8080
fi fi

View File

@@ -1,12 +1,9 @@
#!/bin/bash #!/bin/bash
docker run --rm -it --entrypoint /bin/bash \ docker run --rm -it --entrypoint /bin/bash \
-v $(pwd)/example_config/intelmq/etc:/opt/intelmq/etc \ -v $(pwd)/intelmq_persistence:/opt/intelmq_persistence \
-v $(pwd)/example_config/intelmq-api:/opt/intelmq_api/config \ -v $(pwd)/example_config/intelmq/etc:/etc/intelmq/etc \
-v $(pwd)/intelmq_logs:/opt/intelmq/var/log \ -v $(pwd)/example_config/intelmq-api/config.json:/etc/intelmq/api-config.json:ro \
-v $(pwd)/example_config/intelmq/var/lib:/opt/intelmq/var/lib \ -v $(pwd)/intelmq_logs:/etc/intelmq/var/log \
-v $(pwd)/example_config/intelmq/var/lib:/etc/intelmq/var/lib \
-e "INTELMQ_IS_DOCKER=\"true\"" \ -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_REDIS_CACHE_HOST=$redis_ip" \
intelmq-full:latest intelmq-full:latest