add a curl command to wait for elasticsearch to be fully up on docker

compose services which also list elasticsearch as a dependency

This is used instead of wait-for-it to avoid pulling in more deps in
mozdef_base

NOTE: A better way would be to ensure all programs retry when ES is
down, as it would make everything more reliable (and also faster to
boot)
This commit is contained in:
Guillaume Destuynder 2018-10-30 14:20:54 -07:00
Родитель 1939c60143
Коммит a0557a3865
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 956347F6FBF3A415
1 изменённых файлов: 7 добавлений и 7 удалений

Просмотреть файл

@ -103,7 +103,7 @@ services:
cache_from:
- mozdef/mozdef_bootstrap
- mozdef_bootstrap:latest
command: bash -c 'source /opt/mozdef/envs/python/bin/activate && python initial_setup.py http://elasticsearch:9200 cron/defaultMappingTemplate.json cron/backup.conf'
command: bash -c 'curl --retry 10 -s -S -f http://elasticsearch:9200 && source /opt/mozdef/envs/python/bin/activate && python initial_setup.py http://elasticsearch:9200 cron/defaultMappingTemplate.json cron/backup.conf'
depends_on:
- base
- elasticsearch
@ -120,7 +120,7 @@ services:
- mozdef/mozdef_alertplugins
- mozdef_alertplugins:latest
restart: always
command: bash -c 'source /opt/mozdef/envs/python/bin/activate && python alert_worker.py -c alert_worker.conf'
command: bash -c 'curl --retry 10 -s -S -f http://elasticsearch:9200 && source /opt/mozdef/envs/python/bin/activate && python alert_worker.py -c alert_worker.conf'
depends_on:
- base
- elasticsearch
@ -138,7 +138,7 @@ services:
- mozdef/mozdef_alerts
- mozdef_alerts:latest
restart: always
command: bash -c 'source /opt/mozdef/envs/python/bin/activate && celery -A celeryconfig worker --loglevel=info --beat'
command: bash -c 'curl --retry 10 -s -S -f http://elasticsearch:9200 && source /opt/mozdef/envs/python/bin/activate && celery -A celeryconfig worker --loglevel=info --beat'
depends_on:
- base
- elasticsearch
@ -167,7 +167,7 @@ services:
- mozdef/mozdef_cron
- mozdef_cron:latest
restart: always
command: bash -c 'crond -n'
command: bash -c 'curl --retry 10 -s -S -f http://elasticsearch:9200 && crond -n'
volumes:
- cron:/opt/mozdef/envs/mozdef/cron
- geolite_db:/opt/mozdef/envs/mozdef/data/
@ -188,7 +188,7 @@ services:
- mozdef/mozdef_loginput
- mozdef_loginput:latest
restart: always
command: bash -c 'source /opt/mozdef/envs/python/bin/activate && python index.py -c index.conf'
command: bash -c 'curl --retry 10 -s -S -f http://elasticsearch:9200 && source /opt/mozdef/envs/python/bin/activate && python index.py -c index.conf'
depends_on:
- base
- elasticsearch
@ -205,7 +205,7 @@ services:
- mozdef/mozdef_mq_worker
- mozdef_mq_worker:latest
restart: always
command: bash -c 'source /opt/mozdef/envs/python/bin/activate && python esworker_eventtask.py -c esworker_eventtask.conf'
command: bash -c 'curl --retry 10 -s -S -f http://elasticsearch:9200 && source /opt/mozdef/envs/python/bin/activate && python esworker_eventtask.py -c esworker_eventtask.conf'
depends_on:
- base
- rabbitmq
@ -240,7 +240,7 @@ services:
- mozdef/mozdef_rest
- mozdef_rest:latest
restart: always
command: bash -c 'source /opt/mozdef/envs/python/bin/activate && python index.py -c index.conf'
command: bash -c 'curl --retry 10 -s -S -f http://elasticsearch:9200 && source /opt/mozdef/envs/python/bin/activate && python index.py -c index.conf'
depends_on:
- base
- elasticsearch