Added manager gitrev to intelmq-full

Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>
This commit is contained in:
Sebastian Waldbauer
2021-01-29 10:14:46 +01:00
parent 70744fba44
commit e50605fd26
2 changed files with 7 additions and 3 deletions

View File

@@ -23,7 +23,7 @@ docker build --build-arg BUILD_DATE=$build_date \
-t intelmq-nginx:latest .
docker build --build-arg BUILD_DATE=$build_date \
--build-arg VCS_REF="IntelMQ=$git_ref_core, IntelMQ-API=$git_ref_api" \
--build-arg VCS_REF="IntelMQ=$git_ref_core, IntelMQ-API=$git_ref_api, IntelMQ-Manager=$git_ref_manager" \
--build-arg BUILD_VERSION=$build_version \
-f ./.docker/intelmq-full/Dockerfile \
-t intelmq-full:$build_version \

View File

@@ -1,7 +1,9 @@
#!/bin/bash
redis_id=$(sudo docker run --rm -d -p 6379:6379 -v ~/intelmq-docker/example_config/redis/redis.conf:/redis.conf redis:latest)
amq_id=$(sudo docker run --rm -d -p 5672:5672 -p 15672:15672 rabbitmq:latest)
redis_ip=$(sudo docker inspect -f '{{ range.NetworkSettings.Networks }}{{ .IPAddress }}{{ end }}' $redis_id)
amp_ip=$(sudo docker inspect -f '{{ range.NetworkSettings.Networks}}{{ .IPAddress }}{{ end }}' $amq_id)
sudo docker run --rm -v ~/intelmq-docker/example_config/intelmq/etc:/opt/intelmq/etc \
-v ~/intelmq-docker/example_config/intelmq_api:/opt/intelmq_api/config \
@@ -10,6 +12,8 @@ sudo docker run --rm -v ~/intelmq-docker/example_config/intelmq/etc:/opt/intelmq
-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:1.0 selftest
sudo docker container stop $redis_id
intelmq-full:latest selftest
sudo docker container stop $redis_id
sudo docker container stop $amq_id