From 8ee7c6daf88c5cc9b2a5ecc667ff7bfc938f4a30 Mon Sep 17 00:00:00 2001
From: pycook <pycook@126.com>
Date: Sat, 30 Nov 2019 23:07:12 +0800
Subject: [PATCH] version 1.5: update docker file

---
 Dockerfile                                |  3 ++-
 docker-compose.yml                        | 13 ++++++++++---
 ui/.env                                   |  2 +-
 ui/src/views/cmdb/ci/modules/CiDetail.vue |  4 ++--
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 842cacb..b510247 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -33,7 +33,8 @@ ENV TZ=Asia/Shanghai
 RUN pip install  --no-cache-dir -r docs/requirements.txt \
     && cp ./api/settings.py.example ./api/settings.py \
     && sed -i "s#{user}:{password}@127.0.0.1:3306/{db}#cmdb:123456@mysql:3306/cmdb#g" api/settings.py \
-    && sed -i "s/127.0.0.1/redis/g" api/settings.py
+    && sed -i "s#redis://127.0.0.1#redis://redis#g" api/settings.py \
+    && sed -i 's#CACHE_REDIS_HOST = "127.0.0.1"#CACHE_REDIS_HOST = "redis"#g' api/settings.py
 
 CMD ["bash", "-c", "flask run"]
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 8351480..e85a38a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -54,7 +54,10 @@ services:
           - cmdb-search
 
   cmdb-api:
-    image: registry.cn-qingdao.aliyuncs.com/pycook/cmdb-api:1.0
+    image: registry.cn-qingdao.aliyuncs.com/pycook/cmdb-api:1.5
+#    build:
+#      context: .
+#      target: cmdb-api
     container_name: cmdb-api
     environment:
       TZ: Asia/Shanghai
@@ -63,7 +66,8 @@ services:
       - -c
       - |
         sed -i "s#USE_ES = False#USE_ES = True#g" api/settings.py
-        sed -i "s#ES_HOST = '127.0.0.1'#ES_HOST = cmdb-search#g" api/settings.py
+        sed -i "s#ES_HOST = '127.0.0.1'#ES_HOST = 'cmdb-search'#g" api/settings.py
+        sleep 15
         gunicorn --workers=3 autoapp:app -b 0.0.0.0:5000 -D
         flask init-cache
         celery worker -A celery_worker.celery -E -Q cmdb_async --concurrency=1
@@ -77,7 +81,10 @@ services:
           - cmdb-api
 
   cmdb-ui:
-    image: registry.cn-qingdao.aliyuncs.com/pycook/cmdb-ui:1.0
+    image: registry.cn-qingdao.aliyuncs.com/pycook/cmdb-ui:1.5
+#    build:
+#      context: .
+#      target: cmdb-ui
     container_name: cmdb-ui
     depends_on:
       - cmdb-api
diff --git a/ui/.env b/ui/.env
index f98cf96..580d9f3 100644
--- a/ui/.env
+++ b/ui/.env
@@ -1,3 +1,3 @@
 NODE_ENV=production
 VUE_APP_PREVIEW=false
-VUE_APP_API_BASE_URL=http://127.0.0.1:5001/api
+VUE_APP_API_BASE_URL=http://127.0.0.1:5000/api
diff --git a/ui/src/views/cmdb/ci/modules/CiDetail.vue b/ui/src/views/cmdb/ci/modules/CiDetail.vue
index 317dd8d..dc9b5a9 100644
--- a/ui/src/views/cmdb/ci/modules/CiDetail.vue
+++ b/ui/src/views/cmdb/ci/modules/CiDetail.vue
@@ -35,8 +35,8 @@
             <a-table
               rowKey="ci_id"
               size="middle"
-              :columns="firstCIColumns[child.id]"
-              :dataSource="firstCIs[child.name]"
+              :columns="firstCIColumns[parent.id]"
+              :dataSource="firstCIs[parent.name]"
               :pagination="false"
               :scroll="{x: '100%'}"
             ></a-table>