From 733ac3b2b444a12761dcb6e0f16d15785ff50090 Mon Sep 17 00:00:00 2001 From: fxiang21 Date: Thu, 7 Nov 2019 19:51:44 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=A4=9A=E4=BD=99=E7=9A=84do?= =?UTF-8?q?cker-start=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- api/Dockerfile | 2 +- docker-compose.yml | 2 +- {docker-start => docs}/nginx.cmdb.conf.example | 0 {docker-start => docs}/requirements.txt | 0 5 files changed, 3 insertions(+), 3 deletions(-) rename {docker-start => docs}/nginx.cmdb.conf.example (100%) rename {docker-start => docs}/requirements.txt (100%) diff --git a/README.md b/README.md index 61e7638..cf7a796 100644 --- a/README.md +++ b/README.md @@ -60,5 +60,5 @@ docker运行 ---- 进入主目录 ``` - docker-compose up + docker-compose up -d ``` diff --git a/api/Dockerfile b/api/Dockerfile index 41ee2fc..09597fd 100644 --- a/api/Dockerfile +++ b/api/Dockerfile @@ -12,7 +12,7 @@ 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 + && pip install --no-cache-dir -r docs/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 8c328fc..96ed870 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -81,7 +81,7 @@ services: CMDB_UI_HOST: cmdb-ui:8000 NGINX_PORT: 80 volumes: - - ./docker-start/nginx.cmdb.conf.example:/etc/nginx/conf.d/nginx.cmdb.conf.example + - ./docs/nginx.cmdb.conf.example:/etc/nginx/conf.d/nginx.cmdb.conf.example command: - /bin/bash - -c diff --git a/docker-start/nginx.cmdb.conf.example b/docs/nginx.cmdb.conf.example similarity index 100% rename from docker-start/nginx.cmdb.conf.example rename to docs/nginx.cmdb.conf.example diff --git a/docker-start/requirements.txt b/docs/requirements.txt similarity index 100% rename from docker-start/requirements.txt rename to docs/requirements.txt