From 1505d9d948c6584f6631b41181761b06399400bd Mon Sep 17 00:00:00 2001
From: penzai <penzai@fordeal.com>
Date: Tue, 10 Mar 2020 16:49:40 +0800
Subject: [PATCH] chore: use wait script to hang api before cache/db/es started

---
 Dockerfile         | 3 +++
 docker-compose.yml | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 0bf6ed1..ef5528e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -36,6 +36,9 @@ RUN pip install  --no-cache-dir -r requirements.txt \
     && sed -i "s#redis://127.0.0.1#redis://redis#g" settings.py \
     && sed -i 's#CACHE_REDIS_HOST = "127.0.0.1"#CACHE_REDIS_HOST = "redis"#g' settings.py
 
+ADD https://github.com/ufoscout/docker-compose-wait/releases/download/2.7.3/wait /wait
+RUN chmod +x /wait
+
 CMD ["bash", "-c", "flask run"]
 
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 4ac7850..87f753e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -61,6 +61,7 @@ services:
     container_name: cmdb-api
     environment:
       TZ: Asia/Shanghai
+      WAIT_HOSTS: cmdb-db:3306, cmdb-cache:6379, cmdb-search:9200
     command:
       - /bin/sh
       - -c
@@ -68,10 +69,12 @@ services:
         sed -i "s#USE_ES = False#USE_ES = True#g" settings.py
         sed -i "s#USE_ACL = False#USE_ACL = True#g" settings.py
         sed -i "s#ES_HOST = '127.0.0.1'#ES_HOST = 'cmdb-search'#g" settings.py
-        sleep 20
+        /wait
+        sleep 5
         gunicorn --workers=3 autoapp:app -b 0.0.0.0:5000 -D
         flask init-cache
         flask init-acl
+        
         celery worker -A celery_worker.celery -E -Q cmdb_async --concurrency=1
     depends_on:
       - cmdb-db