Skip to content

Commit

Permalink
优化部署文件
Browse files Browse the repository at this point in the history
  • Loading branch information
shenshuo committed Dec 24, 2018
1 parent 7f3fa3f commit 43b71e8
Show file tree
Hide file tree
Showing 5 changed files with 54 additions and 19 deletions.
13 changes: 8 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ RUN yum update -y && yum install epel-release -y && yum update -y && yum install
#WORKDIR /var/www/

# 2. 准备python
RUN wget https://www.python.org/ftp/python/3.6.4/Python-3.6.4.tar.xz
RUN xz -d Python-3.6.4.tar.xz && tar xvf Python-3.6.4.tar && cd Python-3.6.4 && ./configure && make && make install
RUN wget https://www.python.org/ftp/python/3.6.6/Python-3.6.6.tar.xz
RUN xz -d Python-3.6.6.tar.xz && tar xvf Python-3.6.6.tar && cd Python-3.6.6 && ./configure && make && make install

# 3. 安装yum依赖

Expand All @@ -20,14 +20,17 @@ RUN mkdir -p /var/www/
ADD . /var/www/do_cron/

# 5. 安装pip依赖
RUN pip3 install --upgrade pip
RUN pip3 install --user --upgrade pip
RUN pip3 install -U git+https://github.com/ss1917/ops_sdk.git
RUN pip3 install -r /var/www/do_cron/doc/requirements.txt

# 6. 日志
# 6. 初始化生成表结构
RUN python3 /var/www/do_cron/db_sync.py

# 7. 日志
VOLUME /var/log/

# 7. 准备文件
# 8. 准备文件
COPY doc/supervisor_ops.conf /etc/supervisord.conf

EXPOSE 9900
Expand Down
9 changes: 8 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@
### 部署文档

> <font size="4" color="#dd0000">本服务只能启用一个进程</font>
#### 创建数据库
```sql
create database `do_cron` default character set utf8mb4 collate utf8mb4_unicode_ci;
```

#### 一、docker-compose 安装(推荐)

Expand All @@ -61,7 +65,10 @@
> 建议使用虚拟环境
- 修改配置文件
- 安装依赖 pip3 install -r doc/requirements.txt
- 安装依赖 具体参考 Dockerfile
- - pip3 install --user --upgrade pip
- - pip3 install -U git+https://github.com/ss1917/ops_sdk.git
- - pip3 install -r /var/www/do_cron/doc/requirements.txt
- 从doc目录获取supervisor配置文件 使用 supervisor启动 supervisorctl reload

#### 三、测试api
Expand Down
36 changes: 36 additions & 0 deletions db_sync.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
"""
Contact : [email protected]
Author : shenshuo
Date : 2018/12/24
Desc :
"""

from models.cron import Base
from websdk.consts import const
from settings import settings as app_settings
# ORM创建表结构
from sqlalchemy import create_engine

default_configs = app_settings[const.DB_CONFIG_ITEM][const.DEFAULT_DB_KEY]
engine = create_engine('mysql+pymysql://%s:%s@%s:%s/%s?charset=utf8' % (
default_configs.get(const.DBUSER_KEY),
default_configs.get(const.DBPWD_KEY),
default_configs.get(const.DBHOST_KEY),
default_configs.get(const.DBPORT_KEY),
default_configs.get(const.DBNAME_KEY),
), encoding='utf-8', echo=True)


def create():
Base.metadata.create_all(engine)
print('[Success] 表结构创建成功!')


def drop():
Base.metadata.drop_all(engine)


if __name__ == '__main__':
create()
11 changes: 0 additions & 11 deletions doc/data.sql

This file was deleted.

4 changes: 2 additions & 2 deletions settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@
DEFAULT_DB_DBPORT = os.getenv('DEFAULT_DB_DBPORT', '3306')
DEFAULT_DB_DBUSER = os.getenv('DEFAULT_DB_DBUSER', 'root')
DEFAULT_DB_DBPWD = os.getenv('DEFAULT_DB_DBPWD', 'ljXrcyn7chaBU4F')
DEFAULT_DB_DBNAME = os.getenv('DEFAULT_DB_DBNAME', 'shenshuo')
DEFAULT_DB_DBNAME = os.getenv('DEFAULT_DB_DBNAME', 'do_cron')

READONLY_DB_DBHOST = os.getenv('READONLY_DB_DBHOST', '172.16.0.223')
READONLY_DB_DBPORT = os.getenv('READONLY_DB_DBPORT', '3306')
READONLY_DB_DBUSER = os.getenv('READONLY_DB_DBUSER', 'root')
READONLY_DB_DBPWD = os.getenv('READONLY_DB_DBPWD', 'ljXrcyn7chaBU4F')
READONLY_DB_DBNAME = os.getenv('READONLY_DB_DBNAME', 'shenshuo')
READONLY_DB_DBNAME = os.getenv('READONLY_DB_DBNAME', 'do_cron')

DEFAULT_REDIS_HOST = os.getenv('DEFAULT_REDIS_HOST', '172.16.0.223')
DEFAULT_REDIS_PORT = os.getenv('DEFAULT_REDIS_PORT', '6379')
Expand Down

0 comments on commit 43b71e8

Please sign in to comment.