From 47767e22d84510595dadef4672e453092a1d1dc3 Mon Sep 17 00:00:00 2001
From: fxiang21 <fxiang21@126.com>
Date: Thu, 7 Nov 2019 18:55:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dnginx=E8=BD=AC=E5=8F=91?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile-api     | 16 ----------------
 api/Dockerfile     | 13 +++++++------
 docker-compose.yml | 14 ++++++++------
 3 files changed, 15 insertions(+), 28 deletions(-)
 delete mode 100644 Dockerfile-api

diff --git a/Dockerfile-api b/Dockerfile-api
deleted file mode 100644
index c97df7c..0000000
--- a/Dockerfile-api
+++ /dev/null
@@ -1,16 +0,0 @@
-FROM centos:7.6.1810
-
-LABEL description="Python2.7.5,cmdb"
-
-RUN mkdir -p /data/apps/cmdb /data/apps/cmdb/logs 
-
-COPY . /data/apps/cmdb 
-
-WORKDIR /data/apps/cmdb
-
-RUN yum install -y epel-release \
-	&&  yum install -y python-pip \
-    && pip install  --no-cache-dir -r docker-start/requirements.txt 
-
-CMD ["bash", "-c", "cp api/settings.py.example api/settings.py && sed -i 's#{user}:{password}@127.0.0.1:3306/{db}#:@127.0.0.1:3306/cmdb#g' api/settings.py && flask run"]
-
diff --git a/api/Dockerfile b/api/Dockerfile
index 5433422..41ee2fc 100644
--- a/api/Dockerfile
+++ b/api/Dockerfile
@@ -1,17 +1,18 @@
-FROM centos:7.6.1810
+# build under cmdb directory other than api
+# maybe use: cd ..
+FROM centos:7.6.1810 AS cmdb-api
 
 LABEL description="Python2.7.5,cmdb"
 
-RUN mkdir -p /data/apps/cmdb ~/.pip /data/apps/cmdb/logs 
+RUN mkdir -p /data/apps/cmdb /data/apps/cmdb/logs 
 
-COPY .. /data/apps/cmdb 
+COPY . /data/apps/cmdb 
 
 WORKDIR /data/apps/cmdb
 
-RUN mv /data/apps/cmdb/pip.conf ~/.pip/ \
-	&&  yum install -y epel-release \
+RUN yum install -y epel-release \
 	&&  yum install -y python-pip \
-    && pip install -r requirements.txt 
+    && pip install  --no-cache-dir -r docker-start/requirements.txt 
 
 CMD ["bash", "-c", "cp api/settings.py.example api/settings.py && sed -i 's#{user}:{password}@127.0.0.1:3306/{db}#:@127.0.0.1:3306/cmdb#g' api/settings.py && flask run"]
 
diff --git a/docker-compose.yml b/docker-compose.yml
index c12a135..8c328fc 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,7 +4,7 @@ services:
   cmdb-ui:
     build:
       context: ./ui
-      dockerfile: Dockerfile-ui
+      dockerfile: Dockerfile
     image: cmdb-ui:0.1
     container_name: cmdb-ui
     command: ["sh", "-c", "sed -i 's#http://127.0.0.1:5000##g' .env && yarn run serve"]
@@ -16,15 +16,13 @@ services:
       start_period: 10s
     depends_on:
       - cmdb-api
-    ports:
-      - "8000:8000"
     networks:
       - new
 
   cmdb-api:
     build: 
-      context: .
-      dockerfile: Dockerfile-api
+      context: . 
+      dockerfile: api/Dockerfile
     image: cmdb-api:0.1
     container_name: cmdb-api
     command: 
@@ -34,7 +32,9 @@ services:
         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
-        gunicorn --workers=3 autoapp:app -b 0.0.0.0:5000
+        gunicorn --workers=3 autoapp:app -b 0.0.0.0:5000 -D
+        sleep 5
+        celery worker -A celery_worker.celery -E -Q cmdb_async --concurrency=1
     depends_on:
       - cmdb-db 
       - cmdb-cache
@@ -87,7 +87,9 @@ services:
       - -c
       - |
         envsubst '$$CMDB_API_HOST  $$CMDB_UI_HOST $$NGINX_PORT' < /etc/nginx/conf.d/nginx.cmdb.conf.example > /etc/nginx/conf.d/cmdb.conf
+        rm /etc/nginx/conf.d/default.conf
         nginx -g  'daemon off;'
+        curl http://localhost/api/v0.1/ci/flush
     networks:
       - new
     ports: