7x31
/
cmdb
mirror of https://github.com/veops/cmdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

version 1.5: update docker file

This commit is contained in:
pycook 2019-11-30 23:07:12 +08:00
parent d492e7188c
commit 4987908368
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Dockerfile
View File

@ -33,7 +33,8 @@ ENV TZ=Asia/Shanghai
RUN pip install --no-cache-dir -r docs/requirements.txt \ RUN pip install --no-cache-dir -r docs/requirements.txt \
&& cp ./api/settings.py.example ./api/settings.py \ && 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#{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"] CMD ["bash", "-c", "flask run"]

13
docker-compose.yml
View File

@ -54,7 +54,10 @@ services:
- cmdb-search - cmdb-search
cmdb-api: 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 container_name: cmdb-api
environment: environment:
TZ: Asia/Shanghai TZ: Asia/Shanghai
@ -63,7 +66,8 @@ services:
- -c - -c
- | - |
sed -i "s#USE_ES = False#USE_ES = True#g" api/settings.py 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 gunicorn --workers=3 autoapp:app -b 0.0.0.0:5000 -D
flask init-cache flask init-cache
celery worker -A celery_worker.celery -E -Q cmdb_async --concurrency=1 celery worker -A celery_worker.celery -E -Q cmdb_async --concurrency=1
@ -77,7 +81,10 @@ services:
- cmdb-api - cmdb-api
cmdb-ui: 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 container_name: cmdb-ui
depends_on: depends_on:
- cmdb-api - cmdb-api